diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index ce34797831..f17d44952a 100644
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -4593,7 +4593,10 @@ void wxWindowOS2::MoveChildren(
   int                               nDiff
 )
 {
-    if (GetAutoLayout())
+    //
+    // We want to handle top levels ourself, manually
+    //
+    if (!IsTopLevel() && GetAutoLayout())
     {
         Layout();
     }