diff --git a/docs/changes.txt b/docs/changes.txt
index 484b7f7fda..d8ae058900 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -626,6 +626,7 @@ wxMSW:
 - Fix handling of wxSET, wxCLEAR and wxINVERT in wxDC (Artur Wieczorek).
 - Fix bug with multiple default buttons in a dialog (Artur Wieczorek).
 - Improve tooltips wrapping after updating their text (Artur Wieczorek).
+- Fix checking menu items before appending them to the menu.
 
 wxOSX:
 
diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 3d3ea7e7b0..1845d92dae 100644
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -526,6 +526,15 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
             checkInitially = true;
     }
 
+    // Also handle the case of check menu items that had been checked before
+    // being attached to the menu: we don't need to actually call Check() on
+    // them, so we don't use checkInitially in this case, but we do need to
+    // make them checked at Windows level too. Notice that we shouldn't ask
+    // Windows for the checked state here, as wxMenuItem::IsChecked() does, as
+    // the item is not attached yet, so explicitly call the base class version.
+    if ( pItem->IsCheck() && pItem->wxMenuItemBase::IsChecked() )
+        flags |= MF_CHECKED;
+
     // adjust position to account for the title of a popup menu, if any
     if ( !GetMenuBar() && !m_title.empty() )
         pos += 2; // for the title itself and its separator
@@ -611,6 +620,12 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
                     mii.wID = id;
                 }
 
+                if ( flags & MF_CHECKED )
+                {
+                    mii.fMask |= MIIM_STATE;
+                    mii.fState = MFS_CHECKED;
+                }
+
                 mii.dwItemData = reinterpret_cast<ULONG_PTR>(pItem);
 
                 ok = ::InsertMenuItem(GetHmenu(), pos, TRUE /* by pos */, &mii);