diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp
index fb291681c..ed99016ec 100644
--- a/renderdoc/driver/gl/gl_driver.cpp
+++ b/renderdoc/driver/gl/gl_driver.cpp
@@ -837,6 +837,14 @@ void WrappedOpenGL::DeleteContext(void *contextHandle)
     }
   }
 
+  for(auto it = ctxdata.windows.begin(); it != ctxdata.windows.end();)
+  {
+    void *wndHandle = it->first;
+    it++;
+
+    ctxdata.UnassociateWindow(wndHandle);
+  }
+
   m_ContextData.erase(contextHandle);
 }