diff --git a/config.py b/config.py
index 7fefad355..6ded5855c 100644
--- a/config.py
+++ b/config.py
@@ -6,7 +6,7 @@ debug = False
 
 # You can adjust these paths to your needs
 
-# The main pyfa directory which contains run.py 
+# The main pyfa directory which contains run.py
 # python 2.X uses ansi by default, so we need to convert the character encoding :(
 pyfaPath = unicode(os.path.join(os.getcwd(), os.path.dirname(sys.modules['__main__'].__file__)),
     sys.getfilesystemencoding())
@@ -17,7 +17,7 @@ savePath = os.path.expanduser(os.path.join("~", ".pyfa"))
 # Static EVE Data from the staticdata repository, should be in the staticdata directory in our pyfa directory
 staticPath = os.path.join(pyfaPath, "staticdata")
 
-# The database where we store all the fits etc 
+# The database where we store all the fits etc
 saveDB = os.path.join(savePath, "saveddata.db")
 
 # The database where the static EVE data from the datadump is kept.
diff --git a/gui/PFListPane.py b/gui/PFListPane.py
index 1df8a1c34..40835dd3a 100644
--- a/gui/PFListPane.py
+++ b/gui/PFListPane.py
@@ -36,6 +36,13 @@ class PFListPane(wx.ScrolledWindow):
         self.Bind(wx.EVT_SCROLLWIN_LINEUP, self.MScrollUp)
         self.Bind(wx.EVT_SCROLLWIN_LINEDOWN, self.MScrollDown)
         self.Bind(wx.EVT_CHILD_FOCUS, self.OnChildFocus)
+        self.Bind(wx.EVT_LEFT_DOWN, self.ForceFocus)
+        self.Bind(wx.EVT_MOUSE_CAPTURE_CHANGED, self.ForceFocus)
+
+    def ForceFocus(self,event):
+        if self.FindFocus().Parent != self:
+            self.SetFocus()
+        event.Skip()
 
     def OnChildFocus(self, event):
         event.Skip()