diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp
index bc6ced53b1..bbfafbdba9 100644
--- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp
+++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp
@@ -97,6 +97,9 @@ CString LowLevelWindow_X11::TryVideoMode( RageDisplay::VideoModeParams p, bool &
 			return "No visual available for that depth.";
 		}
 
+		/* Enable StructureNotifyMask, so we receive a MapNotify for the following XMapWindow. */
+		X11Helper::OpenMask( StructureNotifyMask );
+
 		if( !X11Helper::MakeWindow(xvi->screen, xvi->depth, xvi->visual, p.width, p.height) )
 		{
 			return "Failed to create the window.";
@@ -111,9 +114,6 @@ CString LowLevelWindow_X11::TryVideoMode( RageDisplay::VideoModeParams p, bool &
 
 		glXMakeCurrent( X11Helper::Dpy, X11Helper::Win, ctxt );
 
-		/* Enable StructureNotifyMask, so we receive a MapNotify for the following XMapWindow. */
-		X11Helper::OpenMask( StructureNotifyMask );
-
 		XMapWindow( X11Helper::Dpy, X11Helper::Win );
 
 		// HACK: Wait for the MapNotify event, without spinning and