diff --git a/src/d_quit.c b/src/d_quit.c
index 5caf54ec..62232c19 100644
--- a/src/d_quit.c
+++ b/src/d_quit.c
@@ -40,6 +40,8 @@ void I_Quit(void)
 {
     int i;
 
+    SDL_QuitSubSystem(SDL_INIT_VIDEO);
+
     SDL_Quit();
 
     if (!tempdirs)
diff --git a/src/i_video.c b/src/i_video.c
index 8b0f5754..b02e48bc 100644
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -1680,8 +1680,6 @@ void I_ShutdownGraphics(void)
     }
 
     UpdateGrab();
-
-    SDL_QuitSubSystem(SDL_INIT_VIDEO);
 }
 
 void I_InitGraphics(void)