diff --git a/gui/PFListPane.py b/gui/PFListPane.py
index 48b2d6e9e..c19a41065 100644
--- a/gui/PFListPane.py
+++ b/gui/PFListPane.py
@@ -122,7 +122,7 @@ class PFListPane(wx.ScrolledWindow):
     def IsWidgetSelectedByContext(self, widget):
         return False
 
-    def RefreshList(self, doRefresh = False):
+    def RefreshList(self, doRefresh = False, doFocus = True):
         ypos = 0
         maxy = 0
         scrollTo = 0
@@ -151,7 +151,8 @@ class PFListPane(wx.ScrolledWindow):
                 if itemY >=-iheight and itemY< clientH:
                     self._wList[i].Refresh()
 
-        self.SetFocus()
+        if doFocus:
+            self.SetFocus()
 
     def RemoveWidget(self, child):
         child.Destroy()
diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py
index d64468262..a59b11211 100644
--- a/gui/shipBrowser.py
+++ b/gui/shipBrowser.py
@@ -282,7 +282,7 @@ class ShipBrowser(wx.Panel):
                 self.lpane.AddWidget(FitItem(self.lpane, ID, (shipName, name,timestamp), shipID))
             if len(shipList) == 0 and len(fitList) == 0 :
                 self.lpane.AddWidget(PFStaticText(self.lpane, label = "No matching results."))
-            self.lpane.RefreshList()
+            self.lpane.RefreshList(doFocus = False)
         self.lpane.Thaw()
 
 class PFStaticText(wx.StaticText):