diff --git a/src/x11_init.c b/src/x11_init.c
index 666866de..60a0add3 100644
--- a/src/x11_init.c
+++ b/src/x11_init.c
@@ -672,12 +672,12 @@ int _glfwPlatformTerminate(void)
 
     _glfwTerminateGammaRamp();
 
-    terminateDisplay();
-
     _glfwTerminateJoysticks();
 
     _glfwTerminateOpenGL();
 
+    terminateDisplay();
+
     // Free clipboard memory
     if (_glfwLibrary.X11.selection.string)
         free(_glfwLibrary.X11.selection.string);