diff --git a/client/win/win_screensaver.cpp b/client/win/win_screensaver.cpp
index 70bd8dcf4c..4bf292e034 100755
--- a/client/win/win_screensaver.cpp
+++ b/client/win/win_screensaver.cpp
@@ -774,7 +774,8 @@ LRESULT CScreensaver::PrimarySaverProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPA
 					return 0; 
 		 
 				case 2:
-                    HWND hwndBOINCAppWindow = NULL;
+                    HWND hwndBOINCGraphicsWindow = NULL;
+                    HWND hwndActiveWindow = NULL;
                     int  iReturnValue = 0;
                     int  iStatus = 0;
 
@@ -785,13 +786,6 @@ LRESULT CScreensaver::PrimarySaverProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPA
                    	m_bErrorMode = FALSE;
     				m_hrError = 0;
 
-                    hwndBOINCAppWindow = ::FindWindow( BOINC_WINDOW_CLASS_NAME, NULL );
-                    if ( NULL != hwndBOINCAppWindow )
-                    {
-                        BOINCTRACE(_T("CScreensaver::PrimarySaverProc - BOINC Application Window Detected\n"));
-                        ::SetForegroundWindow( hwndBOINCAppWindow );
-                    }
-
                     // Lets try and get the current state of the CC
                     if (m_bResetCoreState)
                     {
@@ -831,9 +825,6 @@ LRESULT CScreensaver::PrimarySaverProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPA
                             switch (iStatus)
                             {
                                 case SS_STATUS_ENABLED:
-                                    HWND hwndBOINCGraphicsWindow = NULL;
-                                    HWND hwndActiveWindow = NULL;
-
                                     hwndBOINCGraphicsWindow = FindWindow( BOINC_WINDOW_CLASS_NAME, NULL );
                                     if ( NULL != hwndBOINCGraphicsWindow )
                                     {
diff --git a/lib/gui_rpc_client.h b/lib/gui_rpc_client.h
index 137b3ddbf7..92851025a9 100644
--- a/lib/gui_rpc_client.h
+++ b/lib/gui_rpc_client.h
@@ -55,8 +55,6 @@
 #define SS_STATUS_NOGRAPHICSAPPSEXECUTING    7
 #define SS_STATUS_QUIT                       8
 
-#define BOINC_WINDOW_CLASS_NAME "BOINC_app"
-
 struct GUI_URL {
     std::string name;
     std::string description;