diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index 50a654c4f8..9334bb18fb 100644
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -422,7 +422,8 @@ bool wxTopLevelWindowBase::Layout()
 
 
     // if we're using sizers or constraints - do use them
-    if ( GetSizer()
+    if ( GetAutoLayout()
+            || GetSizer()
 #if wxUSE_CONSTRAINTS
                     || GetConstraints()
 #endif