diff --git a/src/video/windowsrt/SDL_winrtvideo.cpp b/src/video/windowsrt/SDL_winrtvideo.cpp
index 682ea386e..1d56e0c72 100644
--- a/src/video/windowsrt/SDL_winrtvideo.cpp
+++ b/src/video/windowsrt/SDL_winrtvideo.cpp
@@ -222,6 +222,12 @@ WINRT_DestroyWindow(_THIS, SDL_Window * window)
 {
     SDL_WindowData * data = (SDL_WindowData *) window->driverdata;
 
+    if (SDL_WinRTGlobalApp->HasSDLWindowData() &&
+        SDL_WinRTGlobalApp->GetSDLWindowData()->sdlWindow == window)
+    {
+        SDL_WinRTGlobalApp->SetSDLWindowData(NULL);
+    }
+
     if (data) {
         // Delete the reference to the WinRT CoreWindow:
         CoreWindow ^* windowPointer = ((SDL_WindowData *) window->driverdata)->coreWindow;
@@ -234,12 +240,6 @@ WINRT_DestroyWindow(_THIS, SDL_Window * window)
         delete data;
         data = NULL;
     }
-
-    if (SDL_WinRTGlobalApp->HasSDLWindowData() &&
-        SDL_WinRTGlobalApp->GetSDLWindowData()->sdlWindow == window)
-    {
-        SDL_WinRTGlobalApp->SetSDLWindowData(NULL);
-    }
 }
 
 SDL_bool