diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index 7e774913f..573b38f05 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -3272,6 +3272,10 @@ void SDL_DestroyWindow(SDL_Window *window)
         _this->grabbed_window = NULL; /* ungrabbing input. */
     }
 
+    if (_this->current_glwin == window) {
+        _this->current_glwin = NULL;
+    }
+
     /* Now invalidate magic */
     window->magic = NULL;