diff --git a/gui/builtinContextMenus/moduleAmmoPicker.py b/gui/builtinContextMenus/moduleAmmoPicker.py
index eede88888..d64ec5321 100644
--- a/gui/builtinContextMenus/moduleAmmoPicker.py
+++ b/gui/builtinContextMenus/moduleAmmoPicker.py
@@ -192,20 +192,20 @@ class ModuleAmmoPicker(ContextMenu):
                     m.AppendItem(item)
 
                 if charge.name not in ("Light Defender Missile I", "Heavy Defender Missile I"):
-                    sub.AppendItem(self.addCharge(rootMenu, charge))
+                    sub.AppendItem(self.addCharge(rootMenu if msw else sub, charge))
                 else:
                     defender = charge
 
             if defender is not None:
-                m.AppendItem(self.addCharge(rootMenu, defender))
+                m.AppendItem(self.addCharge(rootMenu if msw else m, defender))
             if sub is not None:
                 self.addSeperator(sub, "More Damage")
         else:
             self.charges.sort(key=self.nameSorter)
             for charge in self.charges:
-                m.AppendItem(self.addCharge(rootMenu, charge))
+                m.AppendItem(self.addCharge(rootMenu if msw else m, charge))
 
-        m.AppendItem(self.addCharge(rootMenu, None))
+        m.AppendItem(self.addCharge(rootMenu if msw else m, None))
         return m
 
     def handleAmmoSwitch(self, event):