diff --git a/apps/server/src/services/window.ts b/apps/server/src/services/window.ts
index 3f0813219..c2fab2ac3 100644
--- a/apps/server/src/services/window.ts
+++ b/apps/server/src/services/window.ts
@@ -342,8 +342,11 @@ async function registerGlobalShortcuts() {
                             return;
                         }
 
-                        // window may be hidden / not in focus
-                        showAndFocusWindow(targetWindow);
+                        if (action.actionName === "toggleTray") {
+                            targetWindow.focus();
+                        } else {
+                            showAndFocusWindow(targetWindow);
+                        }
 
                         targetWindow.webContents.send("globalShortcut", action.actionName);
                     })