diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index b610b7f0a5..868accf389 100644
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -114,7 +114,7 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     Window xwindow = XCreateWindow( xdisplay, xparent, pos.x, pos.y, size.x, size.y, 
        0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
     m_mainWidget = (WXWindow) xwindow;
-    
+
     XSelectInput( xdisplay, xwindow,
         ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
         ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 7a5ce9f198..581df02943 100644
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -209,12 +209,19 @@ void wxWindowX11::SetFocus()
     Window wMain = (Window) GetMainWindow();
     if (wMain)
     {
+	// TODO: set a m_needInputFocus flag and do the
+	// the setting in OnIdle or Show, because we can't
+	// set the focus for an unmapped window.
+	// We need to figure out how to find out if the window
+	// is mapped.
+#if 0
         XSetInputFocus(wxGlobalDisplay(), wMain, RevertToParent, CurrentTime);
         
         XWMHints wmhints;
         wmhints.flags = InputHint;
         wmhints.input = True;
         XSetWMHints(wxGlobalDisplay(), wMain, &wmhints);
+#endif
     }
 }