diff --git a/gui/builtinContextMenus/itemRemove.py b/gui/builtinContextMenus/itemRemove.py
index 8e9ede5c6..dca400c5d 100644
--- a/gui/builtinContextMenus/itemRemove.py
+++ b/gui/builtinContextMenus/itemRemove.py
@@ -5,7 +5,7 @@ import wx
 import gui.globalEvents as GE
 from service.fit import Fit
 from service.settings import ContextMenuSettings
-
+import gui.fitCommands as cmd
 
 class ItemRemove(ContextMenu):
     def __init__(self):
@@ -35,9 +35,9 @@ class ItemRemove(ContextMenu):
         fit = sFit.getFit(fitID)
 
         if srcContext == "fittingModule":
-            for module in selection:
-                if module is not None:
-                    sFit.removeModule(fitID, fit.modules.index(module))
+            modules = [module for module in selection if module is not None]
+            self.mainFrame.command.Submit(cmd.FitModuleRemoveCommand(fitID, modules))
+            return  # the command takes care of the PostEvent
         elif srcContext in ("fittingCharge", "projectedCharge"):
             sFit.setAmmo(fitID, None, selection)
         elif srcContext == "droneItem":
diff --git a/gui/fitCommands/moduleRemove.py b/gui/fitCommands/moduleRemove.py
index df1bda3a6..bc055cde6 100644
--- a/gui/fitCommands/moduleRemove.py
+++ b/gui/fitCommands/moduleRemove.py
@@ -5,9 +5,9 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from collections import namedtuple
 
-
 ModuleInfoCache = namedtuple('ModuleInfoCache', ['modPosition', 'itemID', 'state', 'charge'])
 
+
 class FitModuleRemoveCommand(wx.Command):
     def __init__(self, fitID, modules):
         # todo: evaluate mutaplasmid modules