diff --git a/js/main.js b/js/main.js
index 00662423..d6ab8f6f 100644
--- a/js/main.js
+++ b/js/main.js
@@ -169,7 +169,9 @@ app.on('ready', () => {
  * In which case we quit the app
  */
 app.on('window-all-closed', function() {
-    app.quit();
+    if (!isMac) {
+        app.quit();
+    }
 });
 
 /**
diff --git a/js/windowMgr.js b/js/windowMgr.js
index 793d97de..fcbfbb1b 100644
--- a/js/windowMgr.js
+++ b/js/windowMgr.js
@@ -289,7 +289,9 @@ function doCreateMainWindow(initialUrl, initialBounds, isCustomTitleBar) {
             e.preventDefault();
             mainWindow.minimize();
         } else {
-            app.quit();
+            if (!isMac) {
+                app.quit();
+            }
         }
     });