diff --git a/gui/builtinAdditionPanes/droneView.py b/gui/builtinAdditionPanes/droneView.py
index dfd5b5ba4..53c0d8f68 100644
--- a/gui/builtinAdditionPanes/droneView.py
+++ b/gui/builtinAdditionPanes/droneView.py
@@ -306,9 +306,6 @@ class DroneView(Display):
             else:
                 if drone in self.original:
                     mainDrone = drone
-        # Fall back to first selected item only if position is -1
-        elif len(selection) > 0:
-            mainDrone = selection[0]
         sourceContext = "droneItem"
         itemContext = Market.getInstance().getCategoryByItem(mainDrone.item).name if mainDrone is not None else mainDrone
         menu = ContextMenu.getMenu(mainDrone, selection, (sourceContext, itemContext))
diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py
index d54febe0a..c858434c0 100644
--- a/gui/builtinViews/fittingView.py
+++ b/gui/builtinViews/fittingView.py
@@ -663,10 +663,6 @@ class FittingView(d.Display):
             else:
                 if mod in fit.modules:
                     mainMod = mod
-        # Fall back to first selected module only if position is -1
-        elif len(selection) > 0:
-            mainMod = selection[0]
-
         menu = ContextMenu.getMenu(mainMod, selection, *contexts)
         self.PopupMenu(menu)
 
diff --git a/gui/display.py b/gui/display.py
index 94c3e0462..c6c4acd69 100644
--- a/gui/display.py
+++ b/gui/display.py
@@ -291,6 +291,7 @@ class Display(wx.ListCtrl):
             if window.GetName() == 'panel':
                 ptCorrection = window.GetPosition()
                 ptScreen = ptScreen - ptCorrection
+                break
         ptClient = wx.ListCtrl.ScreenToClient(self, ptScreen)
         return ptClient