diff --git a/src/glinject.c b/src/glinject.c
index df5be6a..78a64ab 100644
--- a/src/glinject.c
+++ b/src/glinject.c
@@ -140,6 +140,7 @@ static bool gl_init_funcs(bool glx)
         GETGLXADDR(GetProcAddress);
         GETGLXADDR(GetProcAddressARB);
         GETGLXPROCADDR(DestroyContext);
+        GETGLXPROCADDR(CreateWindow);
         GETGLXPROCADDR(SwapBuffers);
         GETGLXPROCADDR(SwapBuffersMscOML);
         GETGLXPROCADDR(CreatePixmap);
@@ -1072,6 +1073,7 @@ void *eglCreateWindowSurface(void *display, void *config, void *win, const intpt
 void *glXGetProcAddress(const char *procName);
 void *glXGetProcAddressARB(const char *procName);
 void glXDestroyContext(void *display, void *context);
+bool glXCreateWindow(void *display, void *config, unsigned long win, const int *attribList);
 void glXSwapBuffers(void *display, void *surface);
 int64_t glXSwapBuffersMscOML(void *display, void *drawable, int64_t target_msc, int64_t divisor, int64_t remainder);
 
@@ -1084,7 +1086,8 @@ static struct {
     ADD_HOOK(glXGetProcAddressARB),
     ADD_HOOK(glXSwapBuffers),
     ADD_HOOK(glXSwapBuffersMscOML),
-    ADD_HOOK(glXDestroyContext)
+    ADD_HOOK(glXDestroyContext),
+    ADD_HOOK(glXCreateWindow)
 #undef ADD_HOOK
 };
 
@@ -1127,6 +1130,17 @@ void glXDestroyContext(void *display, void *context)
     glx_f.DestroyContext(display, context);
 }
 
+bool glXCreateWindow(void *display, void *config, unsigned long win, const int *attribList)
+{
+    if (!gl_init_funcs(/*glx*/true)) {
+        return false;
+    }
+
+    gl_free();
+
+    return glx_f.CreateWindow(display, config, win, attribList);
+}
+
 void glXSwapBuffers(void *display, void *drawable)
 {
     if (!gl_init_funcs(/*glx*/true)) {
diff --git a/src/glinject.h b/src/glinject.h
index d64265e..38f8172 100644
--- a/src/glinject.h
+++ b/src/glinject.h
@@ -94,6 +94,7 @@ struct glx_funcs {
     void *(*GetProcAddress)(const char*);
     void *(*GetProcAddressARB)(const char*);
     void (*DestroyContext)(void *display, void *context);
+    bool (*CreateWindow)(void *display, void *config, unsigned long win, const int *attribList);
     void (*SwapBuffers)(void *display, void *drawable);
     int64_t (*SwapBuffersMscOML)(void *display, void *drawable, int64_t target_msc, int64_t divisor, int64_t remainder);
     void *(*CreatePixmap)(void *display, void *config, unsigned long pixmap, const int *attribList);