diff --git a/docs/changes.txt b/docs/changes.txt
index a69ab38840..6a248c35ca 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -71,6 +71,7 @@ wxMSW:
 - fixed bug with wxTR_EDIT_LABELS not workign with wxTR_MULTIPLE
 - fixes for compilation with OpenWatcom compiler
 - fixed wxStaticText best size calculation (was wrong by '&' width)
+- fixed calling wxFrame::Maximize(FALSE) before the window is shown
 
 OLD CHANGES
 ===========
diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 5873b25370..4758fd9a52 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -567,7 +567,7 @@ void wxTopLevelWindowMSW::Maximize(bool maximize)
     {
         // we can't maximize the hidden frame because it shows it as well, so
         // just remember that we should do it later in this case
-        m_maximizeOnShow = TRUE;
+        m_maximizeOnShow = maximize;
     }
 }