diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 88d11a20ac..e880d8ae24 100644
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -178,17 +178,6 @@ bool wxWindow::MapOrUnmap(WXWidget widget, bool map)
     if ( !w )
         return FALSE;
 
-    if ( map )
-    {
-        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.
@@ -196,6 +185,17 @@ bool wxWindow::MapOrUnmap(WXWidget widget, bool map)
     // or that most controls are shown every time they are moved or resized!
     XtSetMappedWhenManaged( w, map );
 
+    if ( map )
+    {
+        XtManageChild(w);
+        // XtMapWidget(w);
+    }
+    else
+    {
+        // XtUnmapWidget(w);
+        XtUnmanageChild(w);
+    }
+
     return TRUE;
 }
 
@@ -694,7 +694,7 @@ bool wxWindow::Show(bool show)
 
     if (m_borderWidget || m_scrolledWindow)
     {
-        MapOrUnmap(m_drawingArea, show);
+        // MapOrUnmap(m_drawingArea, show);
         MapOrUnmap(m_borderWidget ? m_borderWidget : m_scrolledWindow, show);
     }
     else