diff --git a/clientgui/DlgExclusiveApps.cpp b/clientgui/DlgExclusiveApps.cpp
index f31d8aff13..9586a9b048 100644
--- a/clientgui/DlgExclusiveApps.cpp
+++ b/clientgui/DlgExclusiveApps.cpp
@@ -169,13 +169,10 @@ CDlgExclusiveApps::CDlgExclusiveApps(wxWindow* parent) :
 
     ReadPreferenceSettings();
 
-// CAF  SetSizerAndFit(dialogSizer);
-     Layout();
-     dialogSizer->Fit( this );
-     SetSizer( dialogSizer );
+    Layout();
+    SetSizerAndFit(dialogSizer);
 
-// CAF    Fit();
-    Centre();
+    Centre();   // Center the dialog over the main window
 }
 
 /* destructor */
diff --git a/clientgui/sg_BoincSimpleFrame.cpp b/clientgui/sg_BoincSimpleFrame.cpp
index 7653afc2d0..e741ce3b2c 100644
--- a/clientgui/sg_BoincSimpleFrame.cpp
+++ b/clientgui/sg_BoincSimpleFrame.cpp
@@ -1000,10 +1000,9 @@ CSimpleGUIPanel::CSimpleGUIPanel(wxWindow* parent) :
 	mainSizer->Add( buttonsSizer, 0, wxLEFT | wxRIGHT | wxEXPAND, 2 * SIDEMARGINS );
     mainSizer->AddSpacer(ADJUSTFORYDPI(10));
 
-	SetSizer(mainSizer);
     Layout();
-    
-    mainSizer->Fit(GetParent());
+    SetSizerAndFit(mainSizer);
+    parent->SetSizerAndFit(mainSizer);
 
     SetBackgroundBitmap();   
 
@@ -1031,6 +1030,8 @@ CSimpleGUIPanel::~CSimpleGUIPanel()
 	delete checkForNewNoticesTimer;
     m_bmpBg = wxNullBitmap; // Deletes old bitmap via reference counting
     
+    GetParent()->SetSizer(NULL, false); // Avoid trying to delete mainSizer twice
+    
     wxLogTrace(wxT("Function Start/End"), wxT("CSimpleGUIPanel::CSimpleGUIPanel - Destructor Function End"));
 }