diff --git a/gui/builtinMarketBrowser/itemView.py b/gui/builtinMarketBrowser/itemView.py
index 559d807ec..bd7129917 100644
--- a/gui/builtinMarketBrowser/itemView.py
+++ b/gui/builtinMarketBrowser/itemView.py
@@ -23,7 +23,7 @@ class ItemView(Display):
     def __init__(self, parent, marketBrowser):
         Display.__init__(self, parent)
         pyfalog.debug("Initialize ItemView")
-        marketBrowser.Bind(wx.EVT_TREE_SEL_CHANGED, self.selectionMade)
+        marketBrowser.Bind(wx.EVT_TREE_SEL_CHANGED, self.treeSelectionChanged)
 
         self.unfilteredStore = set()
         self.filteredStore = set()
@@ -97,7 +97,10 @@ class ItemView(Display):
 
         self.sMkt.serviceMarketRecentlyUsedModules["pyfaMarketRecentlyUsedModules"].append(itemID)
 
-    def selectionMade(self, event=None):
+    def treeSelectionChanged(self, event=None):
+        self.selectionMade('tree')
+
+    def selectionMade(self, context):
         self.marketBrowser.mode = 'normal'
         # Grab the threeview selection and check if it's fine
         sel = self.marketView.GetSelection()
@@ -130,6 +133,10 @@ class ItemView(Display):
                 self.marketBrowser.mode = 'recent'
 
             self.setToggles()
+            if context == 'tree' and self.marketBrowser.settings.get('marketMGMarketSelectMode') == 1:
+                for btn in self.marketBrowser.metaButtons:
+                    if not btn.GetValue():
+                        btn.setUserSelection(True)
             self.filterItemStore()
 
     def updateItemStore(self, items):
@@ -185,7 +192,7 @@ class ItemView(Display):
         realsearch = search.replace("*", "")
         # Re-select market group if search query has zero length
         if len(realsearch) == 0:
-            self.selectionMade()
+            self.selectionMade('search')
             return
 
         self.marketBrowser.mode = 'search'
diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py
index 1acb8a144..5e9f13cd3 100644
--- a/gui/marketBrowser.py
+++ b/gui/marketBrowser.py
@@ -126,7 +126,7 @@ class MarketBrowser(wx.Panel):
             for btn in self.metaButtons:
                 if not btn.GetValue():
                     btn.setUserSelection(True)
-        self.itemView.selectionMade()
+        self.itemView.selectionMade('jump')
 
     @property
     def mode(self):