diff --git a/public/menu.js b/public/menu.js
index f166b4f3..14310ec8 100644
--- a/public/menu.js
+++ b/public/menu.js
@@ -122,7 +122,14 @@ module.exports = (app, mainWindow, newVersion) => {
       ],
     },
 
-    { role: 'windowMenu' },
+    // On Windows the windowMenu has a close Ctrl+W which clashes with File->Close shortcut
+    ...(process.platform === 'darwin'
+      ? [{ role: 'windowMenu' }]
+      : [{
+        label: 'Window',
+        submenu: [{ role: 'minimize' }],
+      }]
+    ),
 
     {
       label: 'Tools',