diff --git a/default_app/main.js b/default_app/main.js
index 181f2f00a9be..ceb7d1677c48 100644
--- a/default_app/main.js
+++ b/default_app/main.js
@@ -197,9 +197,7 @@ app.once('ready', () => {
         role: 'front'
       }
     ]
-  }
-
-  if (process.platform === 'win32') {
+  } else {
     template.unshift({
       label: 'File',
       submenu: [
diff --git a/lib/browser/api/menu-item-roles.js b/lib/browser/api/menu-item-roles.js
index 082099818fdc..32d0d07f4b92 100644
--- a/lib/browser/api/menu-item-roles.js
+++ b/lib/browser/api/menu-item-roles.js
@@ -64,7 +64,7 @@ const roles = {
         default: return 'Quit'
       }
     },
-    accelerator: process.platform === 'win32' ? null : 'Command+Q',
+    accelerator: process.platform === 'win32' ? null : 'CommandOrControl+Q',
     appMethod: 'quit'
   },
   redo: {