diff --git a/docs/changes.txt b/docs/changes.txt
index 203e80717f..787f7f6fe3 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -211,6 +211,7 @@ All:
 All (GUI):
 
 - recursive wxSizer::GetItem returns item of given window, sizer or nth index
+- wxLayoutConstraints now use best size, not current size, for AsIs() condition
 
 Unix:
 
diff --git a/src/common/layout.cpp b/src/common/layout.cpp
index 85dcafbb11..c542527219 100644
--- a/src/common/layout.cpp
+++ b/src/common/layout.cpp
@@ -300,7 +300,7 @@ bool wxIndividualLayoutConstraint::SatisfyConstraint(wxLayoutConstraints *constr
                 {
                     int x, y;
                     int w, h;
-                    win->GetSize(&w, &h);
+                    win->GetBestSize(&w, &h);
                     win->GetPosition(&x, &y);
                     value = x + w;
                     done = true;
@@ -453,7 +453,7 @@ bool wxIndividualLayoutConstraint::SatisfyConstraint(wxLayoutConstraints *constr
                 {
                     int x, y;
                     int w, h;
-                    win->GetSize(&w, &h);
+                    win->GetBestSize(&w, &h);
                     win->GetPosition(&x, &y);
                     value = h + y;
                     done = true;
@@ -621,7 +621,7 @@ bool wxIndividualLayoutConstraint::SatisfyConstraint(wxLayoutConstraints *constr
                     if (win)
                     {
                         int h;
-                        win->GetSize(&value, &h);
+                        win->GetBestSize(&value, &h);
                         done = true;
                         return true;
                     }
@@ -679,7 +679,7 @@ bool wxIndividualLayoutConstraint::SatisfyConstraint(wxLayoutConstraints *constr
                     if (win)
                     {
                         int w;
-                        win->GetSize(&w, &value);
+                        win->GetBestSize(&w, &value);
                         done = true;
                         return true;
                     }