diff --git a/src/main/menus/app.js b/src/main/menus/app.js
index e5fd6432..a3cba904 100644
--- a/src/main/menus/app.js
+++ b/src/main/menus/app.js
@@ -39,11 +39,7 @@ var createTemplate = function(mainWindow, config) {
     label: 'Show All',
     selector: 'unhideAllApplications:'
   }, separatorItem, {
-    label: 'Quit ' + app_name,
-    accelerator: 'CmdOrCtrl+Q',
-    click: function(item, focusedWindow) {
-      electron.app.quit();
-    }
+    role: 'quit'
   }] : [{
     label: 'Settings',
     accelerator: 'CmdOrCtrl+,',
@@ -51,11 +47,7 @@ var createTemplate = function(mainWindow, config) {
       mainWindow.loadURL('file://' + __dirname + '/browser/settings.html');
     }
   }, separatorItem, {
-    label: 'Quit',
-    accelerator: 'CmdOrCtrl+Q',
-    click: function(item, focusedWindow) {
-      electron.app.quit();
-    }
+    role: 'quit'
   }];
 
   template.push({
diff --git a/src/main/menus/tray.js b/src/main/menus/tray.js
index 93431e98..4e0b5fa3 100644
--- a/src/main/menus/tray.js
+++ b/src/main/menus/tray.js
@@ -25,10 +25,7 @@ function createTemplate(mainWindow, config) {
     }), {
       type: 'separator'
     }, {
-      label: 'Quit',
-      click: function(item) {
-        app.quit();
-      }
+      role: 'quit'
     }
   ];
   return template;