diff --git a/docs/changes.txt b/docs/changes.txt
index 88a119573b..049385d25e 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -108,6 +108,7 @@ wxMSW:
 - Fix MDI menu display after failure to create a child frame (troelsk).
 - Fix wxScreenDC::GetSize() with multiple monitors (iwbnwif).
 - Fix background colour returned by wxTextCtrl::GetStyle() (Andreas Falkenhahn).
+- Revert to using equally-sized buttons in wxToolBar by default.
 
 wxOSX:
 
diff --git a/src/msw/toolbar.cpp b/src/msw/toolbar.cpp
index d7ae869608..4f0a2fc987 100644
--- a/src/msw/toolbar.cpp
+++ b/src/msw/toolbar.cpp
@@ -1095,7 +1095,7 @@ bool wxToolBar::Realize()
                 // automatically according to the size of their bitmap and text
                 // label, if present. They look hideously ugly without autosizing
                 // when the labels have even slightly different lengths.
-                if ( !IsVertical() )
+                if ( HasFlag(wxTB_HORZ_LAYOUT) )
                 {
                     button.fsStyle |= TBSTYLE_AUTOSIZE;
                 }