diff --git a/src/SDL_compat.c b/src/SDL_compat.c
index 0704c82ce..fdafd5c37 100644
--- a/src/SDL_compat.c
+++ b/src/SDL_compat.c
@@ -543,6 +543,8 @@ SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags)
     }
     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 @@ SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags)
 
     ClearVideoSurface();
 
-    SetupScreenSaver(flags);
-
     /* We're finally done! */
     return SDL_PublicSurface;
 }