diff --git a/src/render/opengl/linux/render_opengl_linux.c b/src/render/opengl/linux/render_opengl_linux.c
index 0214b97a..66403bc3 100644
--- a/src/render/opengl/linux/render_opengl_linux.c
+++ b/src/render/opengl/linux/render_opengl_linux.c
@@ -79,7 +79,7 @@ r_ogl_os_init(CmdLine *cmdln)
     r_ogl_lnx_ctx = glXCreateContextAttribsARB(os_lnx_gfx_state->display, framebuffer_config, 0, 1, context_options);
   }
   
-  glXMakeCurrent(os_lnx_gfx_state->display, None, r_ogl_lnx_ctx);
+  glXMakeCurrent(os_lnx_gfx_state->display, RootWindow(os_lnx_gfx_state->display, visual_info->screen), r_ogl_lnx_ctx);
 }
 
 internal R_Handle
diff --git a/src/render/opengl/win32/render_opengl_win32.c b/src/render/opengl/win32/render_opengl_win32.c
index 7e08edb0..48944a80 100644
--- a/src/render/opengl/win32/render_opengl_win32.c
+++ b/src/render/opengl/win32/render_opengl_win32.c
@@ -78,7 +78,7 @@ r_ogl_os_init(CmdLine *cmdline)
   HGLRC real_ctx = 0;
   if(pf)
   {
-    B32 debug_mode = cmd_line_has_flag(cmdln, str8_lit("opengl_debug"));
+    B32 debug_mode = cmd_line_has_flag(cmdline, str8_lit("opengl_debug"));
 #if BUILD_DEBUG
     debug_mode = 1;
 #endif