diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index 01211ce7c0..0dc35173d1 100644
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -421,8 +421,8 @@ bool wxTopLevelWindowBase::Layout()
         return false;
 
 
-    // if we're using constraints or sizers - do use them
-    if ( GetAutoLayout() )
+    // if we're using sizers or constraints - do use them
+    if ( GetSizer() || GetConstraints() )
     {
         return wxNonOwnedWindow::Layout();
     }