diff --git a/megameklab/src/megameklab/ui/generalUnit/BasicInfoView.java b/megameklab/src/megameklab/ui/generalUnit/BasicInfoView.java
index fcaa7006e..0159eb158 100644
--- a/megameklab/src/megameklab/ui/generalUnit/BasicInfoView.java
+++ b/megameklab/src/megameklab/ui/generalUnit/BasicInfoView.java
@@ -409,7 +409,7 @@ public void setTechBase(boolean clan, boolean mixed) {
     @Override
     public SimpleTechLevel getTechLevel() {
         try {
-            return SimpleTechLevel.valueOf((String) cbTechLevel.getSelectedItem());
+            return SimpleTechLevel.valueOf(((String) cbTechLevel.getSelectedItem()).toUpperCase());
         } catch (Exception e) {
             return SimpleTechLevel.STANDARD;
         }
@@ -495,9 +495,9 @@ private void refreshTechLevel() {
         }
         cbTechLevel.addItem(SimpleTechLevel.EXPERIMENTAL.toString());
         cbTechLevel.addItem(SimpleTechLevel.UNOFFICIAL.toString());
-        cbTechLevel.setSelectedItem(prev);
+        cbTechLevel.setSelectedItem(prev.toString());
         cbTechLevel.addActionListener(this);
-        if ((cbTechLevel.getSelectedItem() == null) || (cbTechLevel.getSelectedItem().equals(prev.toString()))) {
+        if ((cbTechLevel.getSelectedItem() == null) || (!cbTechLevel.getSelectedItem().equals(prev.toString()))) {
             cbTechLevel.setSelectedIndex(0);
         }
     }