diff --git a/src/main/services/WindowService.ts b/src/main/services/WindowService.ts
index 9bfefab68a..eb4e2f104a 100644
--- a/src/main/services/WindowService.ts
+++ b/src/main/services/WindowService.ts
@@ -324,6 +324,11 @@ export class WindowService {
 
       event.preventDefault()
 
+      if (mainWindow.isFullScreen()) {
+        mainWindow.setFullScreen(false)
+        return
+      }
+
       mainWindow.hide()
 
       //for mac users, should hide dock icon if close to tray