--- a/src/video/x11/SDL_x11video.c	Tue Aug 21 07:27:51 2001 +0000
+++ b/src/video/x11/SDL_x11video.c	Fri Aug 31 20:53:05 2001 +0000
@@ -850,9 +850,9 @@
 	if ( ! SDL_windowid ) {
 		XMapWindow(SDL_Display, SDL_Window);
 		XMapWindow(SDL_Display, WMwindow);
+		X11_WaitMapped(this, WMwindow);
 		if ( flags & SDL_FULLSCREEN ) {
 			screen->flags |= SDL_FULLSCREEN;
-			X11_WaitMapped(this, WMwindow);
 			X11_EnterFullScreen(this);
 		} else {
 			screen->flags &= ~SDL_FULLSCREEN;