diff --git a/gui/sfBrowserItem.py b/gui/sfBrowserItem.py
index 4067707c3..81294cba3 100644
--- a/gui/sfBrowserItem.py
+++ b/gui/sfBrowserItem.py
@@ -325,7 +325,8 @@ class SFBrowserItem(wx.Window):
 
 
     def OnLeftDown(self, event):
-        self.CaptureMouse()
+        if not self.HasCapture():
+            self.CaptureMouse()
 
         btn = self.toolbar.MouseClick(event)
 
diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py
index 7e916181c..925ab8c1b 100644
--- a/gui/shipBrowser.py
+++ b/gui/shipBrowser.py
@@ -1712,7 +1712,8 @@ class FitItem(SFItem.SFBrowserItem):
         if self.dragging:
             if not self.dragged:
                 if self.dragMotionTrigger < 0:
-                    self.CaptureMouse()
+                    if not self.HasCapture():
+                        self.CaptureMouse()
                     self.dragWindow = PFBitmapFrame(self, pos, self.dragTLFBmp)
                     self.dragWindow.Show()
                     self.dragged = True