diff --git a/panda/src/glxdisplay/glxGraphicsWindow.cxx b/panda/src/glxdisplay/glxGraphicsWindow.cxx
index 6900c80e40..6d887ddba3 100644
--- a/panda/src/glxdisplay/glxGraphicsWindow.cxx
+++ b/panda/src/glxdisplay/glxGraphicsWindow.cxx
@@ -100,6 +100,7 @@ make_gsg() {
 void glxGraphicsWindow::
 release_gsg() {
   if (_gsg != (GraphicsStateGuardian *)NULL) {
+    glXMakeCurrent(_display, _xwindow, _context);
     GraphicsWindow::release_gsg();
     glXDestroyContext(_display, _context);
     _context = (GLXContext)0;