diff --git a/src/plugins/platforms/windows/qwindowskeymapper.cpp b/src/plugins/platforms/windows/qwindowskeymapper.cpp
index 6a6d8ac5a9..5aa13168bd 100644
--- a/src/plugins/platforms/windows/qwindowskeymapper.cpp
+++ b/src/plugins/platforms/windows/qwindowskeymapper.cpp
@@ -792,14 +792,10 @@ static void showSystemMenu(QWindow* w)
     EnableMenuItem(menu, SC_SIZE, (topLevel->flags() & Qt::MSWindowsFixedSizeDialogHint) || maximized ? disabled : enabled);
     EnableMenuItem(menu, SC_MOVE, maximized ? disabled : enabled);
     EnableMenuItem(menu, SC_CLOSE, enabled);
+    EnableMenuItem(menu, SC_RESTORE, maximized ? enabled : disabled);
 
     // Highlight the first entry in the menu, this is what native Win32 applications usually do.
-    MENUITEMINFOW restoreItem;
-    SecureZeroMemory(&restoreItem, sizeof(restoreItem));
-    restoreItem.cbSize = sizeof(restoreItem);
-    restoreItem.fMask = MIIM_STATE;
-    restoreItem.fState = MFS_HILITE | (maximized ? MFS_ENABLED : MFS_GRAYED);
-    SetMenuItemInfoW(menu, SC_RESTORE, FALSE, &restoreItem);
+    HiliteMenuItem(topLevelHwnd, menu, SC_RESTORE, MF_BYCOMMAND | MFS_HILITE);
 
     // Set bold on close menu item
     MENUITEMINFO closeItem;