diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 4800390b1d..2e9b48a49a 100644
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -172,19 +172,6 @@ bool wxWindow::MapOrUnmap(WXWidget widget, bool domap)
     if ( !w )
         return FALSE;
 
-    // if the widget is not unmanaged, it still intercepts
-    // mouse events, even if it is not mapped (and hence invisible)
-    if ( domap )
-    {
-        XtManageChild(w);
-        XtMapWidget(w);
-    }
-    else
-    {
-        XtUnmapWidget(w);
-        XtUnmanageChild(w);
-    }
-
     //   Rationale: a lot of common operations (including but not
     // limited to moving, resizing and appending items to a listbox)
     // unmamange the widget, do their work, then manage it again.
@@ -192,6 +179,19 @@ bool wxWindow::MapOrUnmap(WXWidget widget, bool domap)
     // or that most controls are shown every time they are moved or resized!
     XtSetMappedWhenManaged( w, domap );
 
+    // if the widget is not unmanaged, it still intercepts
+    // mouse events, even if it is not mapped (and hence invisible)
+    if ( domap )
+    {
+        XtManageChild(w);
+        // XtMapWidget(w);
+    }
+    else
+    {
+        XtUnmanageChild(w);
+        // XtUnmapWidget(w);
+    }
+
     return TRUE;
 }
 
@@ -634,8 +634,8 @@ bool wxWindow::Show(bool show)
 
     if (m_borderWidget || m_scrolledWindow)
     {
-        MapOrUnmap(m_drawingArea, show);
         MapOrUnmap(m_borderWidget ? m_borderWidget : m_scrolledWindow, show);
+        // MapOrUnmap(m_drawingArea, show);
     }
     else
     {