diff --git a/gui/mainFrame.py b/gui/mainFrame.py
index edb6caa80..bb0651598 100644
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -64,14 +64,14 @@ class MainFrame(wx.Frame):
         wx.Frame.__init__(self, None, wx.ID_ANY, title="pyfa - Python Fitting Assistant")
         MainFrame.__instance = self
 
+        self.LoadMainFrameAttribs()
+
         if 'wxMSW' in wx.PlatformInfo:
             self.SetBackgroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_BTNFACE ) )
 
         i = wx.IconFromBitmap(bitmapLoader.getBitmap("pyfa", "icons"))
         self.SetIcon(i)
 
-        self.SetMinSize((1000, 700))
-        self.SetSize((1000, 700))
 
         mainSizer = wx.BoxSizer(wx.HORIZONTAL)
 
@@ -133,10 +133,34 @@ class MainFrame(wx.Frame):
         #self.SetToolBar(MainToolBar(self))
 
         self.registerMenu()
-
+        self.Bind(wx.EVT_CLOSE, self.OnClose)
         #Show ourselves
         self.Show()
 
+    def LoadMainFrameAttribs(self):
+
+        mainFrameDefaultAttribs = {"wnd_x" : 10, "wnd_y" : 10, "wnd_width":1000, "wnd_height": 700}
+        self.mainFrameAttribs = service.SettingsProvider.getInstance().getSettings("pyfaMainWindowAttribs", mainFrameDefaultAttribs)
+
+        width = self.mainFrameAttribs["wnd_width"]
+        height = self.mainFrameAttribs["wnd_height"]
+
+        x = self.mainFrameAttribs["wnd_x"]
+        y = self.mainFrameAttribs["wnd_y"]
+
+        self.SetPosition((x, y))
+        self.SetSize((width, height))
+        self.SetMinSize((mainFrameDefaultAttribs["wnd_width"], mainFrameDefaultAttribs["wnd_height"]))
+
+    def UpdateMainFrameAttribs(self):
+        width,height = self.GetSize()
+        x,y = self.GetPosition()
+
+        self.mainFrameAttribs["wnd_width"] = width
+        self.mainFrameAttribs["wnd_height"] = height
+        self.mainFrameAttribs["wnd_x"] = x
+        self.mainFrameAttribs["wnd_y"] = y
+
     def SetActiveStatsWindow(self, wnd):
         self.activeStatsWnd = wnd
 
@@ -171,12 +195,17 @@ class MainFrame(wx.Frame):
         if page is not None:
             ms.DeletePage(page)
 
+    def OnClose(self, event):
+        self.UpdateMainFrameAttribs()
+        service.SettingsProvider.getInstance().saveAll()
+        event.Skip()
+
     def ExitApp(self, evt):
-        try:
-            service.SettingsProvider.getInstance().saveAll()
-            self.Close()
-        except PyDeadObjectError:
-            pass
+#        try:
+        self.Close()
+#        except PyDeadObjectError:
+#            pass
+        event.Skip()
 
     def ShowAboutBox(self, evt):
         info = wx.AboutDialogInfo()
diff --git a/service/settings.py b/service/settings.py
index e6f581ed0..6ac8d70ab 100644
--- a/service/settings.py
+++ b/service/settings.py
@@ -40,11 +40,16 @@ class SettingsProvider():
         s = self.settings.get(area)
         if s is None:
             p = os.path.join(self.BASE_PATH, area)
-            if not os.path.exists(p):
-                return
 
-            f = open(p, "rb")
-            info = cPickle.load(f)
+            if not os.path.exists(p):
+                info = {}
+                if defaults:
+                    for item in defaults:
+                        info[item] = defaults[item]
+            else:
+                f = open(p, "rb")
+                info = cPickle.load(f)
+
             self.settings[area] = s = Settings(p, info)
 
         return s