diff --git a/Modules/opengl/opengl.cpp b/Modules/opengl/opengl.cpp
--- a/Modules/opengl/opengl.cpp
+++ b/Modules/opengl/opengl.cpp
@@ -729,6 +729,7 @@
       qDebug() << "Error: glXMakeCurrent failed\n";
    }
 
+   glXMakeCurrent(dpy, GL_NONE, nullptr);
    glXDestroyContext(dpy, ctx);
    XDestroyWindow(dpy, win);
    XFree(visinfo);
@@ -845,6 +846,7 @@
       qDebug() <<"Error: eglMakeCurrent() failed\n";
    }
 
+   eglMakeCurrent(egl_dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
    eglDestroyContext(egl_dpy, ctx);
    eglDestroySurface(egl_dpy, surf);
    XDestroyWindow(dpy, win);