diff --git a/gui/mainFrame.py b/gui/mainFrame.py
index 82c33791b..362e0b134 100644
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -146,6 +146,7 @@ class MainFrame(wx.Frame):
 
         self.marketBrowser = MarketBrowser(self.notebookBrowsers)
         self.notebookBrowsers.AddPage(self.marketBrowser, "Market", tabImage = marketImg, showClose = False)
+        self.marketBrowser.splitter.SetSashPosition(self.marketHeight)
 
         self.shipBrowser = ShipBrowser(self.notebookBrowsers)
         self.notebookBrowsers.AddPage(self.shipBrowser, "Ships", tabImage = shipBrowserImg, showClose = False)
@@ -159,8 +160,8 @@ class MainFrame(wx.Frame):
         self.notebookBrowsers.SetSelection(1)
 
         self.splitter.SplitVertically(self.notebookBrowsers, self.FitviewAdditionsPanel)
-        self.splitter.SetMinimumPaneSize(204)
-        self.splitter.SetSashPosition(300)
+        self.splitter.SetMinimumPaneSize(220)
+        self.splitter.SetSashPosition(self.browserWidth)
 
         cstatsSizer = wx.BoxSizer(wx.VERTICAL)
 
@@ -227,7 +228,7 @@ class MainFrame(wx.Frame):
 
 
     def LoadMainFrameAttribs(self):
-        mainFrameDefaultAttribs = {"wnd_width": 1000, "wnd_height": 680, "wnd_maximized": False}
+        mainFrameDefaultAttribs = {"wnd_width": 1000, "wnd_height": 680, "wnd_maximized": False, "browser_width": 300, "market_height": 0}
         self.mainFrameAttribs = service.SettingsProvider.getInstance().getSettings("pyfaMainWindowAttribs", mainFrameDefaultAttribs)
 
         if self.mainFrameAttribs["wnd_maximized"]:
@@ -241,6 +242,9 @@ class MainFrame(wx.Frame):
         self.SetSize((width, height))
         self.SetMinSize((mainFrameDefaultAttribs["wnd_width"], mainFrameDefaultAttribs["wnd_height"]))
 
+        self.browserWidth = self.mainFrameAttribs["browser_width"]
+        self.marketHeight = self.mainFrameAttribs["market_height"]
+
     def UpdateMainFrameAttribs(self):
         if self.IsIconized():
             return
@@ -250,6 +254,9 @@ class MainFrame(wx.Frame):
         self.mainFrameAttribs["wnd_height"] = height
         self.mainFrameAttribs["wnd_maximized"] = self.IsMaximized()
 
+        self.mainFrameAttribs["browser_width"] = self.notebookBrowsers.GetSize()[0]
+        self.mainFrameAttribs["market_height"] = self.marketBrowser.marketView.GetSize()[1]
+
     def SetActiveStatsWindow(self, wnd):
         self.activeStatsWnd = wnd
 
diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py
index 1c8329a1b..7f4404c59 100644
--- a/gui/marketBrowser.py
+++ b/gui/marketBrowser.py
@@ -51,7 +51,7 @@ class MarketBrowser(wx.Panel):
         self.itemView = ItemView(self.splitter, self)
 
         self.splitter.SplitHorizontally(self.marketView, self.itemView)
-        self.splitter.SetMinimumPaneSize(250)
+        self.splitter.SetMinimumPaneSize(150)
 
         # Setup our buttons for metaGroup selection
         # Same fix as for search box on macs,