diff --git a/src/main/createWindow.js b/src/main/createWindow.js
index d83f9b1c3..738ab792a 100644
--- a/src/main/createWindow.js
+++ b/src/main/createWindow.js
@@ -78,7 +78,14 @@ export default appState => {
   window.on('close', event => {
     if (!appState.isQuitting && !appState.autoUpdateAccepted) {
       event.preventDefault();
-      window.hide();
+      if (window.isFullScreen()) {
+        window.once('leave-full-screen', () => {
+          window.hide();
+        });
+        window.setFullScreen(false);
+      } else {
+        window.hide();
+      }
     }
   });