diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py
index 2c186d85d..334565e27 100644
--- a/gui/builtinViews/fittingView.py
+++ b/gui/builtinViews/fittingView.py
@@ -623,10 +623,10 @@ class FittingView(d.Display):
     def spawnMenu(self, event):
         if self.activeFitID is None or self.getColumn(self.ScreenToClient(event.Position)) == self.getColIndex(State):
             return
+
         sMkt = Market.getInstance()
         selection = []
         contexts = []
-
         for mod in self.getSelectedMods():
             # Test if this is a mode, which is a special snowflake of a Module
             if isinstance(mod, Mode):
@@ -650,13 +650,24 @@ class FittingView(d.Display):
                     if srcContext not in tuple(fCtxt[0] for fCtxt in contexts):
                         contexts.append(fullContext)
                 selection.append(mod)
-
         sFit = Fit.getInstance()
         fit = sFit.getFit(self.activeFitID)
-
         contexts.append(("fittingShip", "Ship" if not fit.isStructure else "Citadel"))
 
-        menu = ContextMenu.getMenu(selection[0], selection, *contexts)
+        clickedPos = self.getRow(event.Position)
+        mainMod = None
+        if clickedPos != -1:
+            try:
+                mod = self.mods[clickedPos]
+            except IndexError:
+                pass
+            else:
+                if mod in fit.modules:
+                    mainMod = mod
+        if mainMod is None:
+            mainMod = selection[0]
+
+        menu = ContextMenu.getMenu(mainMod, selection, *contexts)
         self.PopupMenu(menu)
 
     def click(self, event):
diff --git a/gui/display.py b/gui/display.py
index a34f92d3d..d284fa86d 100644
--- a/gui/display.py
+++ b/gui/display.py
@@ -270,3 +270,18 @@ class Display(wx.ListCtrl):
 
     def columnBackground(self, colItem, item):
         return colItem.GetBackgroundColour()
+
+    def getRow(self, pointAbs, fallback=None):
+        pointBase = self.GetScreenPosition()
+        pointRel = pointAbs - pointBase
+        # HitTest is buggy as hell, do some workarounds here
+        # https://github.com/wxWidgets/Phoenix/issues/232
+        row = self.HitTest(pointRel)[0]
+        if row != -1:
+            return row - 1
+        if fallback is not None:
+            return fallback
+        return row
+
+
+