diff --git a/gui/sfBrowserItem.py b/gui/sfBrowserItem.py
index 5a60de531..f72b158b3 100644
--- a/gui/sfBrowserItem.py
+++ b/gui/sfBrowserItem.py
@@ -200,6 +200,9 @@ class SFBrowserItem(wx.Window):
         self.highlighted = False
         self.selected = False
         self.bkBitmap = None
+
+        self.canBeDragged = False
+
         self.toolbar = PFToolbar(self)
 
 
@@ -246,9 +249,24 @@ class SFBrowserItem(wx.Window):
     def MouseMove(self, event):
         pass
 
+    def SetDraggable(self, mode = True):
+        self.canBeDragged = mode
+
     def OnLeftUp(self, event):
+
         if self.HasCapture():
             self.ReleaseMouse()
+        if not self.canBeDragged:
+            mposx, mposy = wx.GetMousePosition()
+            rect = self.GetRect()
+            rect.top = rect.left = 0
+            cx,cy = self.ScreenToClient((mposx,mposy))
+            if not rect.Contains((cx,cy)):
+                self.SetHighlighted(False)
+                self.toolbar.ClearState()
+                self.Refresh()
+                return
+
 
         btn = self.toolbar.MouseClick(event)
 
diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py
index e44244ae7..d64468262 100644
--- a/gui/shipBrowser.py
+++ b/gui/shipBrowser.py
@@ -1198,6 +1198,8 @@ class FitItem(SFItem.SFBrowserItem):
         self.fontNormal = wx.FontFromPixelSize((0,14),wx.SWISS, wx.NORMAL, wx.NORMAL, False)
         self.fontSmall = wx.FontFromPixelSize((0,12),wx.SWISS, wx.NORMAL, wx.NORMAL, False)
 
+        self.SetDraggable()
+
         self.toolbar.AddButton(self.copyBmp,"Copy", self.copyBtnCB)
         self.renameBtn = self.toolbar.AddButton(self.renameBmp,"Rename", self.renameBtnCB)
         self.toolbar.AddButton(self.deleteBmp, "Delete", self.deleteBtnCB)