diff --git a/src/index.js b/src/index.js
index a6c7e1d85..a72d76f3a 100644
--- a/src/index.js
+++ b/src/index.js
@@ -31,7 +31,6 @@ if (process.platform !== 'darwin') {
       if (mainWindow.isMinimized()) mainWindow.restore();
       mainWindow.focus();
     }
-    return true;
   });
 
   if (isSecondInstance) {
@@ -111,6 +110,13 @@ const createWindow = async () => {
     app.isMaximized = true;
   });
 
+  mainWindow.on('close', (e) => {
+    if (settings.get('minimizeToSystemTray')) {
+      e.preventDefault();
+      mainWindow.minimize();
+    }
+  });
+
   mainWindow.on('unmaximize', () => {
     app.isMaximized = false;
   });