diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp
index 89659ccb20..57e1848049 100644
--- a/clientgui/MainFrame.cpp
+++ b/clientgui/MainFrame.cpp
@@ -365,13 +365,14 @@ bool CMainFrame::SaveState()
     wxASSERT(NULL != pConfig);
     wxASSERT(NULL != m_pNotebook);
 
-
     //
     // Save Frame State
     //
     pConfig->SetPath(strBaseConfigLocation);
 
     pConfig->Write(wxT("CurrentPage"), m_pNotebook->GetSelection());
+    pConfig->Write(wxT("Width"), GetSize().GetWidth());
+    pConfig->Write(wxT("Height"), GetSize().GetHeight());
 
 
     //
@@ -411,6 +412,8 @@ bool CMainFrame::RestoreState()
     wxString        strPreviousLocation = wxEmptyString;
     wxInt32         iIndex = 0;
     wxInt32         iPageCount = 0;
+    wxInt32         iHeight = 0;
+    wxInt32         iWidth = 0;
 
 
     wxASSERT(NULL != pConfig);
@@ -428,6 +431,10 @@ bool CMainFrame::RestoreState()
     pConfig->Read(wxT("CurrentPage"), &iCurrentPage, 1);
     m_pNotebook->SetSelection(iCurrentPage);
 
+    pConfig->Read(wxT("Width"), &iWidth, 800);
+    pConfig->Read(wxT("Height"), &iHeight, 600);
+    SetSize( -1, -1, iWidth, iHeight );
+
 
     //
     // Restore Page(s) State