diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py
index a29d63328..79df0f928 100644
--- a/gui/shipBrowser.py
+++ b/gui/shipBrowser.py
@@ -140,6 +140,24 @@ class ShipBrowser(wx.Panel):
         self.lpane.RefreshList()
         self.Show()
 
+    def searchStage(self, event):
+        sMarket = service.Market.getInstance()
+        sFit = service.Market.getInstance()
+        query = event.text
+
+        self.lpane.RemoveAllChildren()
+        shipList = sMarket.searchShips(query)
+        fitList = sFit.searchFits(query)
+
+        for ID, name, race in shipList:
+            self.lpane.AddWidget(ShipItem(self.lpane, ID, (name, len(sFit.getFitsWithShip(ID))), race))
+
+        for ID, name, shipID, shipName in fitList:
+            self.lpane.AddWidget(FitItem(self.lpane, ID, (shipName, name), shipID))
+
+        self.lpane.RefreshList()
+        self.Show()
+
 class PFGenBitmapButton(GenBitmapButton):
     def __init__(self, parent, id, bitmap, pos, size, style):
         GenBitmapButton.__init__(self, parent, id, bitmap, pos, size, style)
diff --git a/service/fit.py b/service/fit.py
index fed1017e5..9e564b2ad 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -87,6 +87,14 @@ class Fit(object):
         fit.calculateModifiedAttributes()
         return fit
 
+    def searchFits(self, name):
+        results = eos.db.searchFits(name)
+        fits = []
+        for fit in results:
+            fits.append((fit.ID, fit.name, fit.ship.item.ID, fit.ship.item.name))
+
+        return fits
+
     def addImplant(self, fitID, itemID):
         if fitID is None:
             return False
diff --git a/service/market.py b/service/market.py
index dfacfadba..2658c8382 100644
--- a/service/market.py
+++ b/service/market.py
@@ -162,14 +162,6 @@ class Market():
     def searchItems(self, name, callback):
         self.searchWorkerThread.scheduleSearch(name, callback)
 
-    def searchFits(self, name):
-        results = eos.db.searchFits(name)
-        fits = []
-        for fit in results:
-            fits.append((fit.ID, fit.name, fit.ship.item.name))
-
-        return fits
-
     def getImplantTree(self):
         return self.getChildren(27)