--- a/src/SDL_compat.c	Wed Feb 16 02:55:46 2011 -0800
+++ b/src/SDL_compat.c	Wed Feb 16 02:57:00 2011 -0800
@@ -543,6 +543,8 @@
     }
     SDL_SetWindowIcon(SDL_VideoWindow, SDL_VideoIcon);
 
+    SetupScreenSaver(flags);
+
     window_flags = SDL_GetWindowFlags(SDL_VideoWindow);
     surface_flags = 0;
     if (window_flags & SDL_WINDOW_FULLSCREEN) {
@@ -631,8 +633,6 @@
 
     ClearVideoSurface();
 
-    SetupScreenSaver(flags);
-
     /* We're finally done! */
     return SDL_PublicSurface;
 }