diff --git a/megameklab/src/megameklab/ui/generalUnit/BasicInfoView.java b/megameklab/src/megameklab/ui/generalUnit/BasicInfoView.java
index f505aaa9f..a0d7d7078 100644
--- a/megameklab/src/megameklab/ui/generalUnit/BasicInfoView.java
+++ b/megameklab/src/megameklab/ui/generalUnit/BasicInfoView.java
@@ -244,6 +244,7 @@ public void setFromEntity(Entity en) {
         if (en.getManualBV() >= 0) {
             setManualBV(en.getManualBV());
         }
+        cbRole.removeActionListener(this);
         cbRole.removeAllItems();
         for (UnitRole role : UnitRole.values()) {
             if (role.isAvailableTo(en)) {
@@ -251,6 +252,7 @@ public void setFromEntity(Entity en) {
             }
         }
         cbRole.setSelectedItem(en.getRole());
+        cbRole.addActionListener(this);
         
         refreshFaction();
     }