diff --git a/apps/server/src/services/window.ts b/apps/server/src/services/window.ts
index 3f0813219..986170cb6 100644
--- a/apps/server/src/services/window.ts
+++ b/apps/server/src/services/window.ts
@@ -6,6 +6,7 @@ import optionService from "./options.js";
 import log from "./log.js";
 import sqlInit from "./sql_init.js";
 import cls from "./cls.js";
+import { KeyboardActionNames } from "@triliumnext/commons";
 import keyboardActionsService from "./keyboard_actions.js";
 import electron from "electron";
 import type { App, BrowserWindowConstructorOptions, BrowserWindow, WebContents, IpcMainEvent } from "electron";
@@ -319,6 +320,7 @@ function closeSetupWindow() {
 }
 
 async function registerGlobalShortcuts() {
+    const toggleTrayAction: KeyboardActionNames = "toggleTray";
     const { globalShortcut } = await import("electron");
 
     await sqlInit.dbReady;
@@ -342,8 +344,11 @@ async function registerGlobalShortcuts() {
                             return;
                         }
 
-                        // window may be hidden / not in focus
-                        showAndFocusWindow(targetWindow);
+                        if (action.actionName === toggleTrayAction) {
+                            targetWindow.focus();
+                        } else {
+                            showAndFocusWindow(targetWindow);
+                        }
 
                         targetWindow.webContents.send("globalShortcut", action.actionName);
                     })