diff --git a/src/main/services/window-manager.ts b/src/main/services/window-manager.ts
index f537b375..efc8881c 100644
--- a/src/main/services/window-manager.ts
+++ b/src/main/services/window-manager.ts
@@ -135,13 +135,17 @@ export class WindowManager {
 
     this.mainWindow.on("ready-to-show", () => {
       if (!app.isPackaged) WindowManager.mainWindow?.webContents.openDevTools();
-      WindowManager.mainWindow?.show();
 
       if (
         process.argv.includes("--hide") ||
         process.argv.includes("--hidden")
       ) {
         WindowManager.mainWindow?.hide();
+        process.argv = process.argv.filter(
+          (arg) => arg !== "--hide" && arg !== "--hidden"
+        );
+      } else {
+        WindowManager.mainWindow?.show();
       }
     });
 
@@ -317,14 +321,15 @@ export class WindowManager {
     if (process.platform !== "darwin") {
       tray.addListener("click", () => {
         if (this.mainWindow) {
-          if (WindowManager.mainWindow?.isMinimized())
-            WindowManager.mainWindow.restore();
-
-          WindowManager.mainWindow?.focus();
-          return;
+          if (
+            WindowManager.mainWindow?.isMinimized() ||
+            !WindowManager.mainWindow?.isVisible()
+          ) {
+            WindowManager.mainWindow?.show();
+          }
+        } else {
+          this.createMainWindow();
         }
-
-        this.createMainWindow();
       });
 
       tray.addListener("right-click", showContextMenu);