diff --git a/src/os4_window.c b/src/os4_window.c
index 89c0b5bc..53f3320c 100644
--- a/src/os4_window.c
+++ b/src/os4_window.c
@@ -221,6 +221,8 @@ void _glfwDestroyWindowOS4(_GLFWwindow* window)
         window->os4.appIcon = NULL;
     }
 
+    IIntuition->CloseWindow(window->os4.handle);
+
     if (window->os4.gadget) {
         IIntuition->DisposeObject((Object *)window->os4.gadget);
         window->os4.gadget = NULL;
@@ -231,8 +233,6 @@ void _glfwDestroyWindowOS4(_GLFWwindow* window)
         window->os4.image = NULL;
     }
 
-    IIntuition->CloseWindow(window->os4.handle);
-
     if (window->monitor)
         releaseMonitor(window);