diff --git a/gui/builtinPreferenceViews/pyfaMarketPreferences.py b/gui/builtinPreferenceViews/pyfaMarketPreferences.py
index 069ecfd12..e31b1d82b 100644
--- a/gui/builtinPreferenceViews/pyfaMarketPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaMarketPreferences.py
@@ -34,20 +34,22 @@ class PFMarketPref(PreferenceView):
         self.m_staticline1 = wx.StaticLine(panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL)
         mainSizer.Add(self.m_staticline1, 0, wx.EXPAND | wx.TOP | wx.BOTTOM, 5)
 
-        self.tbTotalPriceBox = wx.StaticBoxSizer(wx.VERTICAL, panel, "Total Price Includes")
-        self.tbTotalPriceDrones = wx.CheckBox(panel, -1, "Drones", wx.DefaultPosition, wx.DefaultSize, 1)
-        self.tbTotalPriceDrones.SetValue(self.priceSettings.get("drones"))
-        self.tbTotalPriceDrones.Bind(wx.EVT_CHECKBOX, self.OnTotalPriceDroneChange)
-        self.tbTotalPriceBox.Add(self.tbTotalPriceDrones, 0, wx.LEFT | wx.RIGHT | wx.TOP, 5)
-        self.tbTotalPriceCargo = wx.CheckBox(panel, -1, "Cargo", wx.DefaultPosition, wx.DefaultSize, 1)
-        self.tbTotalPriceCargo.SetValue(self.priceSettings.get("cargo"))
-        self.tbTotalPriceCargo.Bind(wx.EVT_CHECKBOX, self.OnTotalPriceCargoChange)
-        self.tbTotalPriceBox.Add(self.tbTotalPriceCargo, 0, wx.LEFT | wx.RIGHT, 5)
-        self.tbTotalPriceCharacter = wx.CheckBox(panel, -1, "Implants && Boosters", wx.DefaultPosition, wx.DefaultSize, 1)
-        self.tbTotalPriceCharacter.SetValue(self.priceSettings.get("character"))
-        self.tbTotalPriceCharacter.Bind(wx.EVT_CHECKBOX, self.OnTotalPriceCharacterChange)
-        self.tbTotalPriceBox.Add(self.tbTotalPriceCharacter, 0, wx.LEFT | wx.RIGHT | wx.BOTTOM, 5)
-        mainSizer.Add(self.tbTotalPriceBox, 0, wx.EXPAND | wx.TOP | wx.RIGHT, 10)
+        delayTimer = wx.BoxSizer(wx.HORIZONTAL)
+        self.stMarketDelay = wx.StaticText(panel, wx.ID_ANY, "Market Search Delay (ms):", wx.DefaultPosition, wx.DefaultSize, 0)
+        self.stMarketDelay.Wrap(-1)
+        self.stMarketDelay.SetCursor(helpCursor)
+        self.stMarketDelay.SetToolTip(wx.ToolTip('The delay between a keystroke and the market search. Can help reduce lag when typing fast in the market search box.'))
+        delayTimer.Add(self.stMarketDelay, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
+        self.intDelay = IntCtrl(panel, max=1000, limited=True)
+        delayTimer.Add(self.intDelay, 0, wx.ALL, 5)
+        mainSizer.Add(delayTimer, 0, wx.EXPAND | wx.TOP | wx.RIGHT, 10)
+        self.intDelay.SetValue(self.sFit.serviceFittingOptions["marketSearchDelay"])
+        self.intDelay.Bind(wx.lib.intctrl.EVT_INT, self.onMarketDelayChange)
+
+        self.cbMarketShortcuts = wx.CheckBox(panel, wx.ID_ANY, "Show market shortcuts", wx.DefaultPosition, wx.DefaultSize, 0)
+        mainSizer.Add(self.cbMarketShortcuts, 0, wx.EXPAND | wx.TOP | wx.RIGHT, 10)
+        self.cbMarketShortcuts.SetValue(self.sFit.serviceFittingOptions["showMarketShortcuts"] or False)
+        self.cbMarketShortcuts.Bind(wx.EVT_CHECKBOX, self.onCBShowShortcuts)
 
         priceSizer = wx.BoxSizer(wx.HORIZONTAL)
         self.stDefaultSystem = wx.StaticText(panel, wx.ID_ANY, "Default Market Prices:", wx.DefaultPosition, wx.DefaultSize, 0)
@@ -67,37 +69,40 @@ class PFMarketPref(PreferenceView):
         self.chPriceSystem.SetStringSelection(self.sFit.serviceFittingOptions["priceSystem"])
         self.chPriceSystem.Bind(wx.EVT_CHOICE, self.onPriceSelection)
 
-        delayTimer = wx.BoxSizer(wx.HORIZONTAL)
-        self.stMarketDelay = wx.StaticText(panel, wx.ID_ANY, "Market Search Delay (ms):", wx.DefaultPosition, wx.DefaultSize, 0)
-        self.stMarketDelay.Wrap(-1)
-        self.stMarketDelay.SetCursor(helpCursor)
-        self.stMarketDelay.SetToolTip(wx.ToolTip('The delay between a keystroke and the market search. Can help reduce lag when typing fast in the market search box.'))
-        delayTimer.Add(self.stMarketDelay, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
-        self.intDelay = IntCtrl(panel, max=1000, limited=True)
-        delayTimer.Add(self.intDelay, 0, wx.ALL, 5)
-        mainSizer.Add(delayTimer, 0, wx.EXPAND | wx.TOP | wx.RIGHT, 10)
-        self.intDelay.SetValue(self.sFit.serviceFittingOptions["marketSearchDelay"])
-        self.intDelay.Bind(wx.lib.intctrl.EVT_INT, self.onMarketDelayChange)
+        self.tbTotalPriceBox = wx.StaticBoxSizer(wx.VERTICAL, panel, "Total Price Includes")
+        self.tbTotalPriceDrones = wx.CheckBox(panel, -1, "Drones", wx.DefaultPosition, wx.DefaultSize, 1)
+        self.tbTotalPriceDrones.SetValue(self.priceSettings.get("drones"))
+        self.tbTotalPriceDrones.Bind(wx.EVT_CHECKBOX, self.OnTotalPriceDroneChange)
+        self.tbTotalPriceBox.Add(self.tbTotalPriceDrones, 0, wx.LEFT | wx.RIGHT | wx.TOP, 5)
+        self.tbTotalPriceCargo = wx.CheckBox(panel, -1, "Cargo", wx.DefaultPosition, wx.DefaultSize, 1)
+        self.tbTotalPriceCargo.SetValue(self.priceSettings.get("cargo"))
+        self.tbTotalPriceCargo.Bind(wx.EVT_CHECKBOX, self.OnTotalPriceCargoChange)
+        self.tbTotalPriceBox.Add(self.tbTotalPriceCargo, 0, wx.LEFT | wx.RIGHT, 5)
+        self.tbTotalPriceCharacter = wx.CheckBox(panel, -1, "Implants && Boosters", wx.DefaultPosition, wx.DefaultSize, 1)
+        self.tbTotalPriceCharacter.SetValue(self.priceSettings.get("character"))
+        self.tbTotalPriceCharacter.Bind(wx.EVT_CHECKBOX, self.OnTotalPriceCharacterChange)
+        self.tbTotalPriceBox.Add(self.tbTotalPriceCharacter, 0, wx.LEFT | wx.RIGHT | wx.BOTTOM, 5)
+        mainSizer.Add(self.tbTotalPriceBox, 0, wx.EXPAND | wx.TOP | wx.RIGHT, 10)
 
-        self.rbMarketSearch = wx.RadioBox(panel, -1, "Market Search & Recent Items", wx.DefaultPosition, wx.DefaultSize, ["No changes to meta buttons", "Enable all meta buttons for a duration of search / recents", "Enable all meta buttons"], 1, wx.RA_SPECIFY_COLS)
+        self.rbMarketSearch = wx.RadioBox(panel, -1, "Market Search && Recent Items", wx.DefaultPosition, wx.DefaultSize, ["No changes to meta buttons", "Enable all meta buttons for a duration of search / recents", "Enable all meta buttons"], 1, wx.RA_SPECIFY_COLS)
         self.rbMarketSearch.SetSelection(self.priceSettings.get('marketMGSearchMode'))
         mainSizer.Add(self.rbMarketSearch, 0, wx.RIGHT | wx.TOP | wx.EXPAND, 10)
         self.rbMarketSearch.Bind(wx.EVT_RADIOBOX, self.OnMarketSearchChange)
 
-        self.rbMarketJump = wx.RadioBox(panel, -1, "Item Market Group Jump", wx.DefaultPosition, wx.DefaultSize, ["No changes to meta buttons", "Enable item's meta button", "Enable item's meta button, disable others", "Enable all meta buttons"], 1, wx.RA_SPECIFY_COLS)
-        self.rbMarketJump.SetSelection(self.priceSettings.get('marketMGJumpMode'))
-        mainSizer.Add(self.rbMarketJump, 0, wx.EXPAND | wx.TOP | wx.RIGHT, 10)
-        self.rbMarketJump.Bind(wx.EVT_RADIOBOX, self.OnMarketJumpChange)
+        self.rbMarketEmpty = wx.RadioBox(panel, -1, "Market Group Selection", wx.DefaultPosition, wx.DefaultSize, ["No changes to meta buttons", "Enable all meta buttons"], 1, wx.RA_SPECIFY_COLS)
+        self.rbMarketEmpty.SetSelection(self.priceSettings.get('marketMGMarketSelectMode'))
+        mainSizer.Add(self.rbMarketEmpty, 0, wx.EXPAND | wx.TOP | wx.RIGHT, 10)
+        self.rbMarketEmpty.Bind(wx.EVT_RADIOBOX, self.OnMarketGroupSelectionChange)
 
         self.rbMarketEmpty = wx.RadioBox(panel, -1, "Empty Market View", wx.DefaultPosition, wx.DefaultSize, ["No changes to meta buttons", "Enable leftmost available meta button", "Enable all available meta buttons"], 1, wx.RA_SPECIFY_COLS)
         self.rbMarketEmpty.SetSelection(self.priceSettings.get('marketMGEmptyMode'))
         mainSizer.Add(self.rbMarketEmpty, 0, wx.EXPAND | wx.TOP | wx.RIGHT, 10)
         self.rbMarketEmpty.Bind(wx.EVT_RADIOBOX, self.OnMarketEmptyChange)
 
-        self.cbMarketShortcuts = wx.CheckBox(panel, wx.ID_ANY, "Show market shortcuts", wx.DefaultPosition, wx.DefaultSize, 0)
-        mainSizer.Add(self.cbMarketShortcuts, 0, wx.EXPAND | wx.TOP | wx.RIGHT | wx.BOTTOM, 10)
-        self.cbMarketShortcuts.SetValue(self.sFit.serviceFittingOptions["showMarketShortcuts"] or False)
-        self.cbMarketShortcuts.Bind(wx.EVT_CHECKBOX, self.onCBShowShortcuts)
+        self.rbMarketJump = wx.RadioBox(panel, -1, "Item Market Group Jump", wx.DefaultPosition, wx.DefaultSize, ["No changes to meta buttons", "Enable item's meta button", "Enable item's meta button, disable others", "Enable all meta buttons"], 1, wx.RA_SPECIFY_COLS)
+        self.rbMarketJump.SetSelection(self.priceSettings.get('marketMGJumpMode'))
+        mainSizer.Add(self.rbMarketJump, 0, wx.EXPAND | wx.TOP | wx.RIGHT | wx.BOTTOM, 10)
+        self.rbMarketJump.Bind(wx.EVT_RADIOBOX, self.OnMarketJumpChange)
 
         panel.SetSizer(mainSizer)
         panel.Layout()
@@ -147,5 +152,8 @@ class PFMarketPref(PreferenceView):
     def OnMarketSearchChange(self, event):
         self.priceSettings.set('marketMGSearchMode', event.GetInt())
 
+    def OnMarketGroupSelectionChange(self, event):
+        self.priceSettings.set('marketMGMarketSelectMode', event.GetInt())
+
 
 PFMarketPref.register()
diff --git a/gui/preferenceView.py b/gui/preferenceView.py
index 5077dee17..0ee6230f5 100644
--- a/gui/preferenceView.py
+++ b/gui/preferenceView.py
@@ -46,9 +46,9 @@ from gui.builtinPreferenceViews import (  # noqa: E402, F401
     pyfaEsiPreferences,
     pyfaContextMenuPreferences,
     pyfaStatViewPreferences,
+    pyfaMarketPreferences,
     pyfaUpdatePreferences,
     pyfaEnginePreferences,
     pyfaDatabasePreferences,
-    pyfaLoggingPreferences,
-    pyfaMarketPreferences
+    pyfaLoggingPreferences
 )
diff --git a/service/settings.py b/service/settings.py
index 1c497b3b8..aa55f98d4 100644
--- a/service/settings.py
+++ b/service/settings.py
@@ -436,7 +436,8 @@ class MarketPriceSettings(object):
             "character" : 0,
             "marketMGJumpMode": 0,
             "marketMGEmptyMode": 1,
-            "marketMGSearchMode": 0
+            "marketMGSearchMode": 0,
+            "marketMGMarketSelectMode": 0
         }
 
         self.PriceMenuDefaultSettings = SettingsProvider.getInstance().getSettings("pyfaPriceMenuSettings",