diff --git a/gui/builtinMarketBrowser/itemView.py b/gui/builtinMarketBrowser/itemView.py
index 53aa13afc..207d3a447 100644
--- a/gui/builtinMarketBrowser/itemView.py
+++ b/gui/builtinMarketBrowser/itemView.py
@@ -29,7 +29,6 @@ class ItemView(Display):
         self.filteredStore = set()
         self.recentlyUsedModules = set()
         self.sMkt = marketBrowser.sMkt
-        self.searchMode = marketBrowser.searchMode
         self.sFit = Fit.getInstance()
 
         self.marketBrowser = marketBrowser
@@ -141,7 +140,7 @@ class ItemView(Display):
 
     def filterItemStore(self):
         filteredItems = self.filterItems()
-        if len(filteredItems) == 0:
+        if len(filteredItems) == 0 and len(self.unfilteredStore) > 0:
             setting = self.marketBrowser.settings.get('marketMGEmptyMode')
             # Enable leftmost available
             if setting == 1:
diff --git a/gui/builtinMarketBrowser/marketTree.py b/gui/builtinMarketBrowser/marketTree.py
index cdd998b9d..e4052356b 100644
--- a/gui/builtinMarketBrowser/marketTree.py
+++ b/gui/builtinMarketBrowser/marketTree.py
@@ -9,6 +9,7 @@ pyfalog = Logger(__name__)
 
 
 class MarketTree(wx.TreeCtrl):
+
     def __init__(self, parent, marketBrowser):
         wx.TreeCtrl.__init__(self, parent, style=wx.TR_DEFAULT_STYLE | wx.TR_HIDE_ROOT)
         pyfalog.debug("Initialize marketTree")
diff --git a/gui/builtinMarketBrowser/metaButton.py b/gui/builtinMarketBrowser/metaButton.py
index 3d2762232..0603b4313 100644
--- a/gui/builtinMarketBrowser/metaButton.py
+++ b/gui/builtinMarketBrowser/metaButton.py
@@ -16,7 +16,7 @@ class MetaButton(wx.ToggleButton):
     def setMetaAvailable(self, isAvailable):
         self.Enable(isAvailable)
         # need to also SetValue(False) for windows because Enabled=False AND SetValue(True) looks enabled.
-        if not isAvailable:
+        if not isAvailable and "wxMSW" in wx.PlatformInfo:
             self.SetValue(False)
 
     def reset(self):