diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py
index c4e3f816c..00b17d23c 100644
--- a/gui/marketBrowser.py
+++ b/gui/marketBrowser.py
@@ -27,8 +27,13 @@ class MarketBrowser(wx.Panel):
         wx.Panel.__init__(self, parent)
         vbox = wx.BoxSizer(wx.VERTICAL)
 
+        #Add a search button on top
+        self.search = wx.SearchCtrl(self, wx.ID_ANY, style=wx.TE_PROCESS_ENTER)
+        self.search.ShowCancelButton(True)
+        vbox.Add(self.search, 0, wx.EXPAND)
+
         self.splitter = wx.SplitterWindow(self, style = wx.SP_LIVE_UPDATE)
-        
+
         vbox.Add(self.splitter, 1, wx.EXPAND)
         self.SetSizer(vbox)
 
@@ -71,6 +76,14 @@ class MarketBrowser(wx.Panel):
         self.marketView.Bind(wx.EVT_TREE_ITEM_EXPANDING, self.expandLookup)
         self.marketView.Bind(wx.EVT_TREE_SEL_CHANGED, self.selectionMade)
 
+        #Setup our buttons for metaGroup selection
+        box = wx.BoxSizer(wx.HORIZONTAL)
+        vbox.Add(box, 0)
+        for name in ("normal", "faction", "complex", "officer"):
+            btn = wx.Button(self, wx.ID_ANY, name.capitalize(), style=wx.BU_EXACTFIT)
+            setattr(self, name, btn)
+            box.Add(btn, 0)
+
     def addMarketViewImage(self, iconFile):
         if iconFile is None:
             return -1
diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py
index 2e37da614..3b4119d24 100644
--- a/gui/shipBrowser.py
+++ b/gui/shipBrowser.py
@@ -188,7 +188,6 @@ class ShipBrowser(wx.Panel):
                     _, currShipID = self.shipView.GetPyData(shipChild)
                     if shipID == currShipID:
                         self.shipView.SelectItem(shipChild)
-                        self.SetFocus()
                         break
                     shipChild, shipCookie = self.shipView.GetNextChild(child, shipCookie)
                 break