diff --git a/checkin_notes b/checkin_notes
index 568aaf886b..23d13d9af8 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -8218,6 +8218,7 @@ David  8 Oct 2008
 Charlie 8 Oct 2008
     - MGR: Fix build breaks on Linux.
 
+    clientgui/
         DlgItemProperties.cpp
         ViewWork.cpp
 
@@ -8250,3 +8251,10 @@ David  9 Oct 2008
         DlgItemProperties.cpp
     html/ops/
         db_update.php
+
+Charlie 8 Oct 2008
+    - MGR: Fix SimpleGUI to work with wxWidgets 2.8.7.
+
+    clientgui/
+        sg_BoincSimpleGUI.cpp
+        sg_ViewTabPage.cpp
diff --git a/clientgui/sg_BoincSimpleGUI.cpp b/clientgui/sg_BoincSimpleGUI.cpp
index 951ac08bed..b30f826140 100644
--- a/clientgui/sg_BoincSimpleGUI.cpp
+++ b/clientgui/sg_BoincSimpleGUI.cpp
@@ -352,12 +352,19 @@ void CSimpleFrame::OnReloadSkin(CFrameEvent& WXUNUSED(event)) {
 void CSimpleFrame::OnRefreshView(CFrameEvent& WXUNUSED(event)) {
     wxLogTrace(wxT("Function Start/End"), wxT("CSimpleFrame::OnRefreshView - Function Start"));
     
+    static bool bAlreadyRunning = false;
+    
+    if (bAlreadyRunning) return;
+    bAlreadyRunning = true;
+    
     m_pBackgroundPanel->OnFrameRender();
     
     if (dlgMsgsPtr) {
         dlgMsgsPtr->OnRefresh();
     }
 
+    bAlreadyRunning = false;
+
     wxLogTrace(wxT("Function Start/End"), wxT("CSimpleFrame::OnRefreshView - Function End"));
 }
 
@@ -489,7 +496,6 @@ CSimplePanel::CSimplePanel(wxWindow* parent) :
 	notebookViewInitialized = false;
 	dlgOpen = false;
 
-    
 	InitEmptyView();
 
     wxLogTrace(wxT("Function Start/End"), wxT("CSimplePanel::CSimplePanel - Overloaded Constructor Function End"));
diff --git a/clientgui/sg_ViewTabPage.cpp b/clientgui/sg_ViewTabPage.cpp
index 28bbe0fad2..5f063e43e5 100644
--- a/clientgui/sg_ViewTabPage.cpp
+++ b/clientgui/sg_ViewTabPage.cpp
@@ -86,6 +86,13 @@ CViewTabPage::CViewTabPage(WorkunitNotebook* parent,RESULT* result,std::string n
     //create page
 	CreatePage();
 	project_files_downloaded_time = 0;
+	
+#if wxCHECK_VERSION(2,8,0)
+    // Workaround for unknown problem with newer versions of wxWidgets
+    // Without this, the size of the panel would be reduced to 336,300
+    SetMinSize(wxSize(343, 314));
+#endif
+
 }
 
 CViewTabPage::~CViewTabPage() {
@@ -509,12 +516,6 @@ CSkinSimple* pSkinSimple = wxGetApp().GetSkinManager()->GetSimple();
 
     wxLogTrace(wxT("Function Start/End"), wxT("CViewTabPage::DrawText - Begin"));
     
-#if wxCHECK_VERSION(2,8,0)
-    // Workaround for unknown problem with newer versions of wxWidgets
-    // At this point, the size of the panel has been reduced to 336,300
-    this->SetSize(343,314);
-#endif
-
 #if (defined(__WXMAC__) && (! wxCHECK_VERSION(2,8,0)))
     // wxBufferedDC.GetTextExtent() fails with wxMac-2.6.3, causing Manager to hang
     wxClientDC dc(this);