diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py
index b3f778302..ff11d71a9 100644
--- a/gui/shipBrowser.py
+++ b/gui/shipBrowser.py
@@ -510,6 +510,8 @@ class ShipBrowser(wx.Panel):
 
         self.racesFilter = {}
 
+        self.showRacesFilterInStage2Only = True
+
         for race in self.RACE_ORDER:
             if race:
                 self.racesFilter[race] = False
@@ -624,6 +626,9 @@ class ShipBrowser(wx.Panel):
         self.lpane.RefreshList()
         self.lpane.Thaw()
         self.raceselect.RebuildRaces(self.RACE_ORDER)
+        if self.showRacesFilterInStage2Only:
+            self.raceselect.Show(False)
+            self.Layout()
 
     RACE_ORDER = ["amarr", "caldari", "gallente", "minmatar", "ore", "serpentis", "angel", "blood", "sansha", "guristas", None]
 
@@ -677,6 +682,10 @@ class ShipBrowser(wx.Panel):
 
         self.lpane.RefreshList()
 
+        if self.showRacesFilterInStage2Only:
+            self.raceselect.Show(True)
+            self.Layout()
+
     def stage2(self, event):
         back = event.back
 
@@ -702,7 +711,6 @@ class ShipBrowser(wx.Panel):
         self.navpanel.ShowNewFitButton(False)
         self.navpanel.ShowSwitchEmptyGroupsButton(True)
 
-
     def nameKey(self, info):
         return info[1]
 
@@ -737,6 +745,10 @@ class ShipBrowser(wx.Panel):
         self.navpanel.ShowNewFitButton(True)
         self.navpanel.ShowSwitchEmptyGroupsButton(False)
 
+        if self.showRacesFilterInStage2Only:
+            self.raceselect.Show(False)
+            self.Layout()
+
         fitList.sort(key=self.nameKey)
         shipName = sMarket.getItem(shipID).name
 
@@ -786,8 +798,14 @@ class ShipBrowser(wx.Panel):
                 self.lpane.AddWidget(PFStaticText(self.lpane, label = "No matching results."))
             self.lpane.RefreshList(doFocus = False)
         self.lpane.Thaw()
+
         self.raceselect.RebuildRaces(self.RACE_ORDER)
 
+        if self.showRacesFilterInStage2Only:
+            self.raceselect.Show(False)
+            self.Layout()
+
+
 class PFStaticText(wx.StaticText):
     def _init__(self,parent, label = wx.EmptyString):
         wx.StaticText(self,parent,label)