diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 62c256b3a02..6e5dbc29459 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -954,6 +954,11 @@ __glXInitialize(Display * dpy)
 #endif /* GLX_USE_DRM */
    if (glx_direct)
       dpyPriv->driswDisplay = driswCreateDisplay(dpy, explicit_zink | infer_zink);
+
+#ifdef GLX_USE_WINDOWSGL
+   if (glx_direct && glx_accel)
+      dpyPriv->windowsdriDisplay = driwindowsCreateDisplay(dpy);
+#endif
 #endif /* GLX_DIRECT_RENDERING && !GLX_USE_APPLEGL */
 
 #ifdef GLX_USE_APPLEGL
@@ -963,11 +968,6 @@ __glXInitialize(Display * dpy)
    }
 #endif
 
-#ifdef GLX_USE_WINDOWSGL
-   if (glx_direct && glx_accel)
-      dpyPriv->windowsdriDisplay = driwindowsCreateDisplay(dpy);
-#endif
-
    if (!AllocAndFetchScreenConfigs(dpy, dpyPriv)) {
 #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
       Bool fail = true;