diff --git a/docs/changes.txt b/docs/changes.txt
index 6fa74fff4b..ed090a2d43 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -207,6 +207,8 @@ wxMSW:
 - fix for sending event from wxCheckListBox::Check()
 - wxCaret::SetSize correction for showing caret
 - fix for wxTreeCtrl label editing in wxTR_MULTIPLE mode
+- wxFrame::Maximize(FALSE) would maximize the window if
+  called before showing it
 
 wxMotif:
 
diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index dfadf77544..3ba7c90e3b 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -564,7 +564,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;
     }
 }