diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index c3dac58a0..e0dd19ad6 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -1447,7 +1447,6 @@ SDL_DestroyWindow(SDL_Window * window)
     SDL_VideoDisplay *display;
 
     CHECK_WINDOW_MAGIC(window, );
-    window->magic = NULL;
 
     if (window->title) {
         SDL_free(window->title);
@@ -1466,6 +1465,9 @@ SDL_DestroyWindow(SDL_Window * window)
         SDL_GL_UnloadLibrary();
     }
 
+	/* Now invalidate magic */
+    window->magic = NULL;
+
     /* Unlink the window from the list */
     display = window->display;
     if (window->next) {