diff --git a/src/electron-main.js b/src/electron-main.js
index e98da5c..8d092a1 100644
--- a/src/electron-main.js
+++ b/src/electron-main.js
@@ -952,7 +952,15 @@ app.on('ready', async () => {
             // (this is generally how single-window Mac apps
             // behave, eg. Mail.app)
             e.preventDefault();
-            mainWindow.hide();
+
+            if (mainWindow.isFullScreen()) {
+                mainWindow.once('leave-full-screen', () => mainWindow.hide());
+
+                mainWindow.setFullScreen(false);
+            } else {
+                mainWindow.hide();
+            }
+
             return false;
         }
     });