diff --git a/js/main.js b/js/main.js
index d482bcf3..8a3aa5db 100644
--- a/js/main.js
+++ b/js/main.js
@@ -169,9 +169,7 @@ app.on('ready', () => {
  * In which case we quit the app
  */
 app.on('window-all-closed', function() {
-    if (!isMac) {
-        app.quit();
-    }
+    app.quit();
 });
 
 /**
diff --git a/js/windowMgr.js b/js/windowMgr.js
index aadb87a4..75285070 100644
--- a/js/windowMgr.js
+++ b/js/windowMgr.js
@@ -288,10 +288,11 @@ function doCreateMainWindow(initialUrl, initialBounds, isCustomTitleBar) {
         if (getMinimizeOnClose()) {
             e.preventDefault();
             mainWindow.minimize();
+        } else if (isMac) {
+            e.preventDefault();
+            mainWindow.hide();
         } else {
-            if (!isMac) {
-                app.quit();
-            }
+            app.quit();
         }
     });