diff --git a/src/main.js b/src/main.js
index 50fe8fe5..5967dfe0 100755
--- a/src/main.js
+++ b/src/main.js
@@ -528,13 +528,11 @@ app.on("window-all-closed", function() {
     .killServer()
     .then(utils.killSubprocesses)
     .catch(utils.killSubprocesses);
-  if (process.platform !== "darwin") {
-    utils.log.info("Good bye!");
-    setTimeout(() => {
-      app.quit();
-      process.exit(0);
-    }, 2000);
-  }
+  utils.log.info("Good bye!");
+  setTimeout(() => {
+    app.quit();
+    process.exit(0);
+  }, 2000);
 });
 
 app.on("activate", function() {
@@ -610,6 +608,11 @@ app.on("ready", function() {
           accelerator: "CmdOrCtrl+W",
           role: "close"
         },
+        {
+          label: "Quit",
+          accelerator: "CmdOrCtrl+Q",
+          role: "close"
+        },
         {
           label: "Animations",
           submenu: [