diff --git a/src/SDL_compat.c b/src/SDL_compat.c
index 4b8736cdd..0704c82ce 100644
--- a/src/SDL_compat.c
+++ b/src/SDL_compat.c
@@ -558,6 +558,8 @@ SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags)
         surface_flags |= SDL_NOFRAME;
     }
 
+    SDL_VideoFlags = flags;
+
     /* If we're in OpenGL mode, just create a stub surface and we're done! */
     if (flags & SDL_OPENGL) {
         SDL_VideoContext = SDL_GL_CreateContext(SDL_VideoWindow);
@@ -627,8 +629,6 @@ SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags)
     SDL_PublicSurface =
         (SDL_ShadowSurface ? SDL_ShadowSurface : SDL_VideoSurface);
 
-    SDL_VideoFlags = flags;
-
     ClearVideoSurface();
 
     SetupScreenSaver(flags);