diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py
index 0df1c17b8..1368d81b8 100644
--- a/gui/marketBrowser.py
+++ b/gui/marketBrowser.py
@@ -294,12 +294,14 @@ class ItemView(d.Display):
 
     def scheduleSearch(self, event=None):
         search = self.marketBrowser.search.GetLineText(0)
+        # Make sure we do not count wildcard as search symbol
+        realsearch = search.replace("*", "")
         # Re-select market group if search query has zero length
-        if len(search) == 0:
+        if len(realsearch) == 0:
             self.selectionMade()
             return
         # Show nothing if query is too short
-        elif len(search) < 3:
+        elif len(realsearch) < 3:
             self.clearSearch()
             return
 
diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py
index ffdabfd38..83ce2c84e 100644
--- a/gui/shipBrowser.py
+++ b/gui/shipBrowser.py
@@ -367,7 +367,9 @@ class NavigationPanel(SFItem.SFBrowserItem):
 
     def OnScheduleSearch(self, event):
         search = self.BrowserSearchBox.GetValue()
-        if len(search) < 3 and len(search) >= 0:
+        # Make sure we do not count wildcard as search symbol
+        realsearch = search.replace("*", "")
+        if len(realsearch) < 3 and len(realsearch) >= 0:
             if self.inSearch == True:
                 self.inSearch = False
                 if len(self.shipBrowser.browseHist) > 0: