diff --git a/app/components/sidebar.tsx b/app/components/sidebar.tsx
index 69b2e71f871..6cb71790f52 100644
--- a/app/components/sidebar.tsx
+++ b/app/components/sidebar.tsx
@@ -31,6 +31,8 @@ import { isIOS, useMobileScreen } from "../utils";
 import dynamic from "next/dynamic";
 import { showConfirm, showToast } from "./ui-lib";
 
+import { register } from "@tauri-apps/api/globalShortcut";
+
 const ChatList = dynamic(async () => (await import("./chat-list")).ChatList, {
   loading: () => null,
 });
@@ -128,6 +130,52 @@ function useDragSideBar() {
   };
 }
 
+function useGlobalShortcut() {
+  const chatStore = useChatStore();
+  const navigate = useNavigate();
+  const config = useAppConfig();
+
+  useEffect(() => {
+    // Early return if not in a Tauri environment
+    if (!window.__TAURI__) {
+      return;
+    }
+
+    const handleMasks = async () => {
+      await register("CommandOrControl+Shift+M", () => {
+        if (config.dontShowMaskSplashScreen !== true) {
+          navigate(Path.NewChat, { state: { fromHome: true } });
+        } else {
+          navigate(Path.Masks, { state: { fromHome: true } });
+        }
+      });
+    };
+
+    const handleSettings = async () => {
+      await register("CommandOrControl+,", () => {
+        navigate(Path.Settings);
+      });
+    };
+
+    const handleNewChat = async () => {
+      await register("CommandOrControl+N", () => {
+        if (config.dontShowMaskSplashScreen) {
+          chatStore.newSession();
+          navigate(Path.Chat);
+        } else {
+          navigate(Path.NewChat);
+        }
+      });
+    };
+
+    // Shortcut registration
+    handleMasks();
+    handleSettings();
+    handleNewChat();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [chatStore, navigate, config]);
+}
+
 export function SideBar(props: { className?: string }) {
   const chatStore = useChatStore();
 
@@ -143,6 +191,8 @@ export function SideBar(props: { className?: string }) {
 
   useHotKey();
 
+  useGlobalShortcut();
+
   return (
     <div
       className={`${styles.sidebar} ${props.className} ${
diff --git a/package.json b/package.json
index b31d6a901a0..4520db33aaa 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "@hello-pangea/dnd": "^16.5.0",
     "@next/third-parties": "^14.1.0",
     "@svgr/webpack": "^6.5.1",
+    "@tauri-apps/api": "^1.5.3",
     "@vercel/analytics": "^0.1.11",
     "@vercel/speed-insights": "^1.0.2",
     "emoji-picker-react": "^4.5.15",
@@ -64,4 +65,4 @@
   "resolutions": {
     "lint-staged/yaml": "^2.2.2"
   }
-}
\ No newline at end of file
+}
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index e0892590223..615ccbfa991 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -35,6 +35,7 @@ tauri = { version = "1.5.4", features = [
     "window-start-dragging",
     "window-unmaximize",
     "window-unminimize",
+    "global-shortcut-all",
 ] }
 tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 405d267ff65..35c588dd406 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -50,6 +50,9 @@
       },
       "notification": {
         "all": true
+      },
+      "globalShortcut": {
+        "all": true
       }
     },
     "bundle": {
diff --git a/yarn.lock b/yarn.lock
index db6da708b8b..255e968ab33 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1438,6 +1438,11 @@
   dependencies:
     tslib "^2.4.0"
 
+"@tauri-apps/api@^1.5.3":
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-1.5.3.tgz#f7b362b1f30aadb0a8bbeb7ae111755c0ed33d73"
+  integrity sha512-zxnDjHHKjOsrIzZm6nO5Xapb/BxqUq1tc7cGkFXsFkGTsSWgCPH1D8mm0XS9weJY2OaR73I3k3S+b7eSzJDfqA==
+
 "@tauri-apps/cli-darwin-arm64@1.5.7":
   version "1.5.7"
   resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.5.7.tgz#3435f1b6c4b431e0283f94c3a0bd486be66b24ee"