From f616d116fcd1ae4900b833b9d6f7f1be7fe67844 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Sun, 11 Jan 2026 16:07:53 -0500
Subject: [PATCH 01/17] feat(sidebar): shortcut key bindings and hints

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/renderer/components/Sidebar.tsx           |  66 ++-
 .../__snapshots__/Sidebar.test.tsx.snap       | 408 +++++++++++++++++-
 2 files changed, 449 insertions(+), 25 deletions(-)

diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx
index 0be792987..c4985565d 100644
--- a/src/renderer/components/Sidebar.tsx
+++ b/src/renderer/components/Sidebar.tsx
@@ -1,4 +1,4 @@
-import type { FC } from 'react';
+import { type FC, useEffect } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 
 import {
@@ -41,6 +41,10 @@ export const Sidebar: FC = () => {
 
   const primaryAccountHostname = getPrimaryAccountHostname(auth);
 
+  const goHome = () => {
+    navigate('/', { replace: true });
+  };
+
   const toggleFilters = () => {
     if (location.pathname.startsWith('/filters')) {
       navigate('/', { replace: true });
@@ -59,10 +63,61 @@ export const Sidebar: FC = () => {
   };
 
   const refreshNotifications = () => {
-    navigate('/', { replace: true });
+    goHome();
     fetchNotifications();
   };
 
+  useEffect(() => {
+    const sidebarShortcutHandler = (event: KeyboardEvent) => {
+      // Ignore if user is typing in an input, textarea, or with modifiers
+      if (
+        event.target instanceof HTMLInputElement ||
+        event.target instanceof HTMLTextAreaElement ||
+        event.metaKey ||
+        event.ctrlKey ||
+        event.altKey
+      ) {
+        return;
+      }
+
+      const key = event.key.toLowerCase();
+
+      switch (key) {
+        case 'h':
+          event.preventDefault();
+          goHome();
+          break;
+        case 'r':
+          if (status !== 'loading') {
+            event.preventDefault();
+            refreshNotifications();
+          }
+          break;
+        case 's':
+          if (isLoggedIn) {
+            event.preventDefault();
+            toggleSettings();
+          }
+          break;
+        case 'f':
+          if (isLoggedIn) {
+            event.preventDefault();
+            toggleFilters();
+          }
+          break;
+        default:
+          // No action for other keys
+          break;
+      }
+    };
+
+    document.addEventListener('keydown', sidebarShortcutHandler);
+
+    return () => {
+      document.removeEventListener('keydown', sidebarShortcutHandler);
+    };
+  }, [isLoggedIn, status]);
+
   return (
     <Stack
       className="fixed w-sidebar h-full bg-gitify-sidebar [&_svg]:text-white"
@@ -80,7 +135,8 @@ export const Sidebar: FC = () => {
           data-testid="sidebar-home"
           description="Home"
           icon={LogoIcon}
-          onClick={() => navigate('/', { replace: true })}
+          keybindingHint="H"
+          onClick={() => goHome()}
           size="small"
           tooltipDirection="e"
           variant="invisible"
@@ -103,6 +159,7 @@ export const Sidebar: FC = () => {
             data-testid="sidebar-filter-notifications"
             description="Filter notifications"
             icon={FilterIcon}
+            keybindingHint="F"
             onClick={() => toggleFilters()}
             size="small"
             tooltipDirection="e"
@@ -146,6 +203,7 @@ export const Sidebar: FC = () => {
               description="Refresh notifications"
               disabled={status === 'loading'}
               icon={SyncIcon}
+              keybindingHint="R"
               // loading={status === 'loading'}
               onClick={() => refreshNotifications()}
               size="small"
@@ -156,7 +214,9 @@ export const Sidebar: FC = () => {
             <IconButton
               aria-label="Settings"
               data-testid="sidebar-settings"
+              description="Settings"
               icon={GearIcon}
+              keybindingHint="S"
               onClick={() => toggleSettings()}
               size="small"
               tooltipDirection="e"
diff --git a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
index 58b56b976..52d7c628a 100644
--- a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
+++ b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
@@ -188,11 +188,47 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_1_"
                 popover="auto"
                 role="tooltip"
               >
-                Home
+                <span
+                  id="_r_1_"
+                >
+                  Home
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    h
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        h
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        H
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
               </span>
               <button
                 aria-describedby="_r_3_"
@@ -266,11 +302,47 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_5_"
                 popover="auto"
                 role="tooltip"
               >
-                Filter notifications
+                <span
+                  id="_r_5_"
+                >
+                  Filter notifications
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    f
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        f
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        F
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
               </span>
               <button
                 aria-labelledby="_r_7_"
@@ -392,14 +464,51 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_b_"
                 popover="auto"
                 role="tooltip"
               >
-                Refresh notifications
+                <span
+                  id="_r_b_"
+                >
+                  Refresh notifications
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    r
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        r
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        R
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
               </span>
               <button
-                aria-labelledby="_r_d_"
+                aria-describedby="_r_d_"
+                aria-label="Settings"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
@@ -430,10 +539,47 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_d_"
                 popover="auto"
+                role="tooltip"
               >
-                Settings
+                <span
+                  id="_r_d_"
+                >
+                  Settings
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    s
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        s
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        S
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
               </span>
             </div>
           </div>
@@ -529,11 +675,47 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
               data-direction="e"
-              id="_r_1_"
               popover="auto"
               role="tooltip"
             >
-              Home
+              <span
+                id="_r_1_"
+              >
+                Home
+                <span
+                  class="prc-src-InternalVisuallyHidden-2YaI6"
+                >
+                  (
+                  h
+                  )
+                </span>
+              </span>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+              >
+                <kbd
+                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                  data-testid="keybinding-hint"
+                >
+                  <span
+                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                    data-kbd-chord="true"
+                  >
+                     
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      h
+                    </span>
+                    <span
+                      aria-hidden="true"
+                    >
+                      H
+                    </span>
+                  </span>
+                </kbd>
+              </span>
             </span>
             <button
               aria-describedby="_r_3_"
@@ -607,11 +789,47 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
               data-direction="e"
-              id="_r_5_"
               popover="auto"
               role="tooltip"
             >
-              Filter notifications
+              <span
+                id="_r_5_"
+              >
+                Filter notifications
+                <span
+                  class="prc-src-InternalVisuallyHidden-2YaI6"
+                >
+                  (
+                  f
+                  )
+                </span>
+              </span>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+              >
+                <kbd
+                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                  data-testid="keybinding-hint"
+                >
+                  <span
+                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                    data-kbd-chord="true"
+                  >
+                     
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      f
+                    </span>
+                    <span
+                      aria-hidden="true"
+                    >
+                      F
+                    </span>
+                  </span>
+                </kbd>
+              </span>
             </span>
             <button
               aria-labelledby="_r_7_"
@@ -733,14 +951,51 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
               data-direction="e"
-              id="_r_b_"
               popover="auto"
               role="tooltip"
             >
-              Refresh notifications
+              <span
+                id="_r_b_"
+              >
+                Refresh notifications
+                <span
+                  class="prc-src-InternalVisuallyHidden-2YaI6"
+                >
+                  (
+                  r
+                  )
+                </span>
+              </span>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+              >
+                <kbd
+                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                  data-testid="keybinding-hint"
+                >
+                  <span
+                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                    data-kbd-chord="true"
+                  >
+                     
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      r
+                    </span>
+                    <span
+                      aria-hidden="true"
+                    >
+                      R
+                    </span>
+                  </span>
+                </kbd>
+              </span>
             </span>
             <button
-              aria-labelledby="_r_d_"
+              aria-describedby="_r_d_"
+              aria-label="Settings"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
@@ -771,10 +1026,47 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
               data-direction="e"
-              id="_r_d_"
               popover="auto"
+              role="tooltip"
             >
-              Settings
+              <span
+                id="_r_d_"
+              >
+                Settings
+                <span
+                  class="prc-src-InternalVisuallyHidden-2YaI6"
+                >
+                  (
+                  s
+                  )
+                </span>
+              </span>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+              >
+                <kbd
+                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                  data-testid="keybinding-hint"
+                >
+                  <span
+                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                    data-kbd-chord="true"
+                  >
+                     
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      s
+                    </span>
+                    <span
+                      aria-hidden="true"
+                    >
+                      S
+                    </span>
+                  </span>
+                </kbd>
+              </span>
             </span>
           </div>
         </div>
@@ -927,11 +1219,47 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_g_"
                 popover="auto"
                 role="tooltip"
               >
-                Home
+                <span
+                  id="_r_g_"
+                >
+                  Home
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    h
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        h
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        H
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
               </span>
               <button
                 aria-describedby="_r_i_"
@@ -1190,11 +1518,47 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
               data-direction="e"
-              id="_r_g_"
               popover="auto"
               role="tooltip"
             >
-              Home
+              <span
+                id="_r_g_"
+              >
+                Home
+                <span
+                  class="prc-src-InternalVisuallyHidden-2YaI6"
+                >
+                  (
+                  h
+                  )
+                </span>
+              </span>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+              >
+                <kbd
+                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                  data-testid="keybinding-hint"
+                >
+                  <span
+                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                    data-kbd-chord="true"
+                  >
+                     
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      h
+                    </span>
+                    <span
+                      aria-hidden="true"
+                    >
+                      H
+                    </span>
+                  </span>
+                </kbd>
+              </span>
             </span>
             <button
               aria-describedby="_r_i_"

From 56dfbdc6bffb6c6188768d45d4d50c480706e58c Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Sun, 11 Jan 2026 16:10:29 -0500
Subject: [PATCH 02/17] feat(sidebar): shortcut key bindings and hints

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 .../__snapshots__/AppLayout.test.tsx.snap     | 328 +++++++++++++++++-
 1 file changed, 310 insertions(+), 18 deletions(-)

diff --git a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
index 963d1468c..fed01df49 100644
--- a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
@@ -102,11 +102,47 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   aria-hidden="true"
                   class="prc-TooltipV2-Tooltip-tLeuB"
                   data-direction="e"
-                  id="_r_1_"
                   popover="auto"
                   role="tooltip"
                 >
-                  Home
+                  <span
+                    id="_r_1_"
+                  >
+                    Home
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      (
+                      h
+                      )
+                    </span>
+                  </span>
+                  <span
+                    aria-hidden="true"
+                    class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                  >
+                    <kbd
+                      class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                      data-testid="keybinding-hint"
+                    >
+                      <span
+                        class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                        data-kbd-chord="true"
+                      >
+                         
+                        <span
+                          class="prc-src-InternalVisuallyHidden-2YaI6"
+                        >
+                          h
+                        </span>
+                        <span
+                          aria-hidden="true"
+                        >
+                          H
+                        </span>
+                      </span>
+                    </kbd>
+                  </span>
                 </span>
                 <button
                   aria-describedby="_r_3_"
@@ -180,11 +216,47 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   aria-hidden="true"
                   class="prc-TooltipV2-Tooltip-tLeuB"
                   data-direction="e"
-                  id="_r_5_"
                   popover="auto"
                   role="tooltip"
                 >
-                  Filter notifications
+                  <span
+                    id="_r_5_"
+                  >
+                    Filter notifications
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      (
+                      f
+                      )
+                    </span>
+                  </span>
+                  <span
+                    aria-hidden="true"
+                    class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                  >
+                    <kbd
+                      class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                      data-testid="keybinding-hint"
+                    >
+                      <span
+                        class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                        data-kbd-chord="true"
+                      >
+                         
+                        <span
+                          class="prc-src-InternalVisuallyHidden-2YaI6"
+                        >
+                          f
+                        </span>
+                        <span
+                          aria-hidden="true"
+                        >
+                          F
+                        </span>
+                      </span>
+                    </kbd>
+                  </span>
                 </span>
                 <button
                   aria-labelledby="_r_7_"
@@ -306,14 +378,51 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   aria-hidden="true"
                   class="prc-TooltipV2-Tooltip-tLeuB"
                   data-direction="e"
-                  id="_r_b_"
                   popover="auto"
                   role="tooltip"
                 >
-                  Refresh notifications
+                  <span
+                    id="_r_b_"
+                  >
+                    Refresh notifications
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      (
+                      r
+                      )
+                    </span>
+                  </span>
+                  <span
+                    aria-hidden="true"
+                    class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                  >
+                    <kbd
+                      class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                      data-testid="keybinding-hint"
+                    >
+                      <span
+                        class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                        data-kbd-chord="true"
+                      >
+                         
+                        <span
+                          class="prc-src-InternalVisuallyHidden-2YaI6"
+                        >
+                          r
+                        </span>
+                        <span
+                          aria-hidden="true"
+                        >
+                          R
+                        </span>
+                      </span>
+                    </kbd>
+                  </span>
                 </span>
                 <button
-                  aria-labelledby="_r_d_"
+                  aria-describedby="_r_d_"
+                  aria-label="Settings"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
                   data-loading="false"
@@ -344,10 +453,47 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   aria-hidden="true"
                   class="prc-TooltipV2-Tooltip-tLeuB"
                   data-direction="e"
-                  id="_r_d_"
                   popover="auto"
+                  role="tooltip"
                 >
-                  Settings
+                  <span
+                    id="_r_d_"
+                  >
+                    Settings
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      (
+                      s
+                      )
+                    </span>
+                  </span>
+                  <span
+                    aria-hidden="true"
+                    class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                  >
+                    <kbd
+                      class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                      data-testid="keybinding-hint"
+                    >
+                      <span
+                        class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                        data-kbd-chord="true"
+                      >
+                         
+                        <span
+                          class="prc-src-InternalVisuallyHidden-2YaI6"
+                        >
+                          s
+                        </span>
+                        <span
+                          aria-hidden="true"
+                        >
+                          S
+                        </span>
+                      </span>
+                    </kbd>
+                  </span>
                 </span>
               </div>
             </div>
@@ -459,11 +605,47 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_1_"
                 popover="auto"
                 role="tooltip"
               >
-                Home
+                <span
+                  id="_r_1_"
+                >
+                  Home
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    h
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        h
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        H
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
               </span>
               <button
                 aria-describedby="_r_3_"
@@ -537,11 +719,47 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_5_"
                 popover="auto"
                 role="tooltip"
               >
-                Filter notifications
+                <span
+                  id="_r_5_"
+                >
+                  Filter notifications
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    f
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        f
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        F
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
               </span>
               <button
                 aria-labelledby="_r_7_"
@@ -663,14 +881,51 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_b_"
                 popover="auto"
                 role="tooltip"
               >
-                Refresh notifications
+                <span
+                  id="_r_b_"
+                >
+                  Refresh notifications
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    r
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        r
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        R
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
               </span>
               <button
-                aria-labelledby="_r_d_"
+                aria-describedby="_r_d_"
+                aria-label="Settings"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
@@ -701,10 +956,47 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_d_"
                 popover="auto"
+                role="tooltip"
               >
-                Settings
+                <span
+                  id="_r_d_"
+                >
+                  Settings
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    s
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        s
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        S
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
               </span>
             </div>
           </div>

From 38e8cd6edda4f3348750a80657108d5e22b1580c Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Sun, 11 Jan 2026 16:33:51 -0500
Subject: [PATCH 03/17] feat(sidebar): shortcut key bindings and hints

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/renderer/components/Sidebar.test.tsx | 183 +++++++++++++++++++++++
 1 file changed, 183 insertions(+)

diff --git a/src/renderer/components/Sidebar.test.tsx b/src/renderer/components/Sidebar.test.tsx
index 5c58f3351..970f6545d 100644
--- a/src/renderer/components/Sidebar.test.tsx
+++ b/src/renderer/components/Sidebar.test.tsx
@@ -272,4 +272,187 @@ describe('renderer/components/Sidebar.tsx', () => {
 
     expect(quitAppSpy).toHaveBeenCalledTimes(1);
   });
+
+  describe('keyboard bindings', () => {
+    it('should navigate home when pressing H key', async () => {
+      renderWithAppContext(
+        <MemoryRouter>
+          <Sidebar />
+        </MemoryRouter>,
+      );
+
+      await userEvent.keyboard('h');
+
+      expect(navigateMock).toHaveBeenCalledTimes(1);
+      expect(navigateMock).toHaveBeenCalledWith('/', { replace: true });
+    });
+
+    it('should refresh notifications when pressing R key', async () => {
+      renderWithAppContext(
+        <MemoryRouter>
+          <Sidebar />
+        </MemoryRouter>,
+        {
+          fetchNotifications: fetchNotificationsMock,
+          status: 'success',
+        },
+      );
+
+      await userEvent.keyboard('r');
+
+      expect(navigateMock).toHaveBeenCalledWith('/', { replace: true });
+      expect(fetchNotificationsMock).toHaveBeenCalledTimes(1);
+    });
+
+    it('should not refresh notifications when pressing R key if status is loading', async () => {
+      renderWithAppContext(
+        <MemoryRouter>
+          <Sidebar />
+        </MemoryRouter>,
+        {
+          fetchNotifications: fetchNotificationsMock,
+          status: 'loading',
+        },
+      );
+
+      await userEvent.keyboard('r');
+
+      expect(fetchNotificationsMock).not.toHaveBeenCalled();
+    });
+
+    it('should toggle settings when pressing S key while logged in', async () => {
+      renderWithAppContext(
+        <MemoryRouter>
+          <Sidebar />
+        </MemoryRouter>,
+        {
+          isLoggedIn: true,
+        },
+      );
+
+      await userEvent.keyboard('s');
+
+      expect(navigateMock).toHaveBeenCalledTimes(1);
+      expect(navigateMock).toHaveBeenCalledWith('/settings');
+    });
+
+    it('should not toggle settings when pressing S key while logged out', async () => {
+      renderWithAppContext(
+        <MemoryRouter>
+          <Sidebar />
+        </MemoryRouter>,
+        {
+          isLoggedIn: false,
+        },
+      );
+
+      await userEvent.keyboard('s');
+
+      expect(navigateMock).not.toHaveBeenCalled();
+    });
+
+    it('should toggle filters when pressing F key while logged in', async () => {
+      renderWithAppContext(
+        <MemoryRouter>
+          <Sidebar />
+        </MemoryRouter>,
+        {
+          isLoggedIn: true,
+        },
+      );
+
+      await userEvent.keyboard('f');
+
+      expect(navigateMock).toHaveBeenCalledTimes(1);
+      expect(navigateMock).toHaveBeenCalledWith('/filters');
+    });
+
+    it('should not toggle filters when pressing F key while logged out', async () => {
+      renderWithAppContext(
+        <MemoryRouter>
+          <Sidebar />
+        </MemoryRouter>,
+        {
+          isLoggedIn: false,
+        },
+      );
+
+      await userEvent.keyboard('f');
+
+      expect(navigateMock).not.toHaveBeenCalled();
+    });
+
+    it('should ignore keyboard shortcuts when typing in an input', async () => {
+      renderWithAppContext(
+        <MemoryRouter>
+          <Sidebar />
+        </MemoryRouter>,
+      );
+
+      const input = document.createElement('input');
+      document.body.appendChild(input);
+      input.focus();
+
+      await userEvent.keyboard('h');
+
+      expect(navigateMock).not.toHaveBeenCalled();
+
+      document.body.removeChild(input);
+    });
+
+    it('should ignore keyboard shortcuts when typing in a textarea', async () => {
+      renderWithAppContext(
+        <MemoryRouter>
+          <Sidebar />
+        </MemoryRouter>,
+      );
+
+      const textarea = document.createElement('textarea');
+      document.body.appendChild(textarea);
+      textarea.focus();
+
+      await userEvent.keyboard('r');
+
+      expect(navigateMock).not.toHaveBeenCalled();
+      expect(fetchNotificationsMock).not.toHaveBeenCalled();
+
+      document.body.removeChild(textarea);
+    });
+
+    it('should ignore keyboard shortcuts when modifier keys are pressed', async () => {
+      renderWithAppContext(
+        <MemoryRouter>
+          <Sidebar />
+        </MemoryRouter>,
+        {
+          fetchNotifications: fetchNotificationsMock,
+          status: 'success',
+        },
+      );
+
+      // Note: userEvent.keyboard with modifier syntax like {Shift>h</Shift>} 
+      // would require holding shift, but we test that metaKey/ctrlKey/altKey
+      // prevent action through manual event dispatch
+      const event = new KeyboardEvent('keydown', {
+        key: 'h',
+        metaKey: true,
+      });
+      document.dispatchEvent(event);
+
+      expect(navigateMock).not.toHaveBeenCalled();
+    });
+
+    it('should work with uppercase key press', async () => {
+      renderWithAppContext(
+        <MemoryRouter>
+          <Sidebar />
+        </MemoryRouter>,
+      );
+
+      // userEvent.keyboard converts to lowercase automatically
+      await userEvent.keyboard('H');
+
+      expect(navigateMock).toHaveBeenCalledWith('/', { replace: true });
+    });
+  });
 });

From a5c920d08a78214a9a2adef22cd7618580ca3fbd Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Sun, 11 Jan 2026 16:35:03 -0500
Subject: [PATCH 04/17] feat(sidebar): shortcut key bindings and hints

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/renderer/components/Sidebar.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/components/Sidebar.test.tsx b/src/renderer/components/Sidebar.test.tsx
index 970f6545d..b42461d87 100644
--- a/src/renderer/components/Sidebar.test.tsx
+++ b/src/renderer/components/Sidebar.test.tsx
@@ -430,7 +430,7 @@ describe('renderer/components/Sidebar.tsx', () => {
         },
       );
 
-      // Note: userEvent.keyboard with modifier syntax like {Shift>h</Shift>} 
+      // Note: userEvent.keyboard with modifier syntax like {Shift>h</Shift>}
       // would require holding shift, but we test that metaKey/ctrlKey/altKey
       // prevent action through manual event dispatch
       const event = new KeyboardEvent('keydown', {

From a8eb00d68e3fad58a459204d74de9fa2f72f8ba9 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Sun, 11 Jan 2026 16:37:12 -0500
Subject: [PATCH 05/17] feat(sidebar): shortcut key bindings and hints

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/renderer/components/Sidebar.tsx | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx
index c4985565d..6c187521c 100644
--- a/src/renderer/components/Sidebar.tsx
+++ b/src/renderer/components/Sidebar.tsx
@@ -1,4 +1,4 @@
-import { type FC, useEffect } from 'react';
+import { type FC, useCallback, useEffect } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 
 import {
@@ -41,31 +41,31 @@ export const Sidebar: FC = () => {
 
   const primaryAccountHostname = getPrimaryAccountHostname(auth);
 
-  const goHome = () => {
+  const goHome = useCallback(() => {
     navigate('/', { replace: true });
-  };
+  }, []);
 
-  const toggleFilters = () => {
+  const toggleFilters = useCallback(() => {
     if (location.pathname.startsWith('/filters')) {
       navigate('/', { replace: true });
     } else {
       navigate('/filters');
     }
-  };
+  }, [location.pathname]);
 
-  const toggleSettings = () => {
+  const toggleSettings = useCallback(() => {
     if (location.pathname.startsWith('/settings')) {
       navigate('/', { replace: true });
       fetchNotifications();
     } else {
       navigate('/settings');
     }
-  };
+  }, [location.pathname, fetchNotifications]);
 
-  const refreshNotifications = () => {
+  const refreshNotifications = useCallback(() => {
     goHome();
     fetchNotifications();
-  };
+  }, [goHome, fetchNotifications]);
 
   useEffect(() => {
     const sidebarShortcutHandler = (event: KeyboardEvent) => {
@@ -116,7 +116,14 @@ export const Sidebar: FC = () => {
     return () => {
       document.removeEventListener('keydown', sidebarShortcutHandler);
     };
-  }, [isLoggedIn, status]);
+  }, [
+    isLoggedIn,
+    status,
+    goHome,
+    toggleFilters,
+    toggleSettings,
+    refreshNotifications,
+  ]);
 
   return (
     <Stack

From 8138bf5ce22b3d4a09232688b37207cb51963dd8 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Sun, 11 Jan 2026 17:29:53 -0500
Subject: [PATCH 06/17] Merge branch 'main' into feat/sidebar-keybindings

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/renderer/components/Sidebar.tsx           |  19 ++-
 .../__snapshots__/Sidebar.test.tsx.snap       | 140 +++++++++++-------
 .../__snapshots__/AppLayout.test.tsx.snap     | 128 ++++++++++------
 3 files changed, 181 insertions(+), 106 deletions(-)

diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx
index fde3c8d8f..937498ef0 100644
--- a/src/renderer/components/Sidebar.tsx
+++ b/src/renderer/components/Sidebar.tsx
@@ -115,11 +115,6 @@ export const Sidebar: FC = () => {
     },
   };
 
-  const getKeybindingHint = (handler: () => void): string | undefined => {
-    const shortcut = Object.values(shortcuts).find((s) => s.action === handler);
-    return shortcut ? shortcut.hotkey.toUpperCase() : undefined;
-  };
-
   useEffect(() => {
     const sidebarShortcutHandler = (event: KeyboardEvent) => {
       // Ignore if user is typing in an input, textarea, or with modifiers
@@ -147,7 +142,15 @@ export const Sidebar: FC = () => {
     return () => {
       document.removeEventListener('keydown', sidebarShortcutHandler);
     };
-  }, []);
+  }, [
+    goHome,
+    toggleSettings,
+    toggleFilters,
+    refreshNotifications,
+    toggleFocusMode,
+    isLoggedIn,
+    status,
+  ]);
 
   return (
     <Stack
@@ -265,8 +268,8 @@ export const Sidebar: FC = () => {
               data-testid="sidebar-settings"
               description="Settings"
               icon={GearIcon}
-              keybindingHint={getKeybindingHint(toggleSettings)}
-              onClick={() => toggleSettings()}
+              keybindingHint={shortcuts.settings.hotkey}
+              onClick={() => shortcuts.settings.action()}
               size="small"
               tooltipDirection="e"
               variant="invisible"
diff --git a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
index 7a98825c3..25f33d3b8 100644
--- a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
+++ b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
@@ -302,11 +302,47 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_5_"
                 popover="auto"
                 role="tooltip"
               >
-                Participating and watching
+                <span
+                  id="_r_5_"
+                >
+                  Participating and watching
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    w
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        w
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        W
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
               </span>
               <button
                 aria-describedby="_r_7_"
@@ -341,15 +377,11 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-<<<<<<< HEAD
-=======
-                id="_r_7_"
->>>>>>> main
                 popover="auto"
                 role="tooltip"
               >
                 <span
-                  id="_r_5_"
+                  id="_r_7_"
                 >
                   Filter notifications
                   <span
@@ -507,15 +539,11 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-<<<<<<< HEAD
-=======
-                id="_r_d_"
->>>>>>> main
                 popover="auto"
                 role="tooltip"
               >
                 <span
-                  id="_r_b_"
+                  id="_r_d_"
                 >
                   Refresh notifications
                   <span
@@ -554,12 +582,8 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 </span>
               </span>
               <button
-<<<<<<< HEAD
-                aria-describedby="_r_d_"
+                aria-describedby="_r_f_"
                 aria-label="Settings"
-=======
-                aria-labelledby="_r_f_"
->>>>>>> main
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
@@ -590,15 +614,11 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-<<<<<<< HEAD
-=======
-                id="_r_f_"
->>>>>>> main
                 popover="auto"
                 role="tooltip"
               >
                 <span
-                  id="_r_d_"
+                  id="_r_f_"
                 >
                   Settings
                   <span
@@ -844,11 +864,47 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
               data-direction="e"
-              id="_r_5_"
               popover="auto"
               role="tooltip"
             >
-              Participating and watching
+              <span
+                id="_r_5_"
+              >
+                Participating and watching
+                <span
+                  class="prc-src-InternalVisuallyHidden-2YaI6"
+                >
+                  (
+                  w
+                  )
+                </span>
+              </span>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+              >
+                <kbd
+                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                  data-testid="keybinding-hint"
+                >
+                  <span
+                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                    data-kbd-chord="true"
+                  >
+                     
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      w
+                    </span>
+                    <span
+                      aria-hidden="true"
+                    >
+                      W
+                    </span>
+                  </span>
+                </kbd>
+              </span>
             </span>
             <button
               aria-describedby="_r_7_"
@@ -883,15 +939,11 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
               data-direction="e"
-<<<<<<< HEAD
-=======
-              id="_r_7_"
->>>>>>> main
               popover="auto"
               role="tooltip"
             >
               <span
-                id="_r_5_"
+                id="_r_7_"
               >
                 Filter notifications
                 <span
@@ -1049,15 +1101,11 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
               data-direction="e"
-<<<<<<< HEAD
-=======
-              id="_r_d_"
->>>>>>> main
               popover="auto"
               role="tooltip"
             >
               <span
-                id="_r_b_"
+                id="_r_d_"
               >
                 Refresh notifications
                 <span
@@ -1096,12 +1144,8 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               </span>
             </span>
             <button
-<<<<<<< HEAD
-              aria-describedby="_r_d_"
+              aria-describedby="_r_f_"
               aria-label="Settings"
-=======
-              aria-labelledby="_r_f_"
->>>>>>> main
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
@@ -1132,15 +1176,11 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
               data-direction="e"
-<<<<<<< HEAD
-=======
-              id="_r_f_"
->>>>>>> main
               popover="auto"
               role="tooltip"
             >
               <span
-                id="_r_d_"
+                id="_r_f_"
               >
                 Settings
                 <span
@@ -1329,15 +1369,11 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-<<<<<<< HEAD
-=======
-                id="_r_i_"
->>>>>>> main
                 popover="auto"
                 role="tooltip"
               >
                 <span
-                  id="_r_g_"
+                  id="_r_i_"
                 >
                   Home
                   <span
@@ -1632,15 +1668,11 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
               data-direction="e"
-<<<<<<< HEAD
-=======
-              id="_r_i_"
->>>>>>> main
               popover="auto"
               role="tooltip"
             >
               <span
-                id="_r_g_"
+                id="_r_i_"
               >
                 Home
                 <span
diff --git a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
index b1f14f8b9..116928a30 100644
--- a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
@@ -216,11 +216,47 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   aria-hidden="true"
                   class="prc-TooltipV2-Tooltip-tLeuB"
                   data-direction="e"
-                  id="_r_5_"
                   popover="auto"
                   role="tooltip"
                 >
-                  Participating and watching
+                  <span
+                    id="_r_5_"
+                  >
+                    Participating and watching
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      (
+                      w
+                      )
+                    </span>
+                  </span>
+                  <span
+                    aria-hidden="true"
+                    class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                  >
+                    <kbd
+                      class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                      data-testid="keybinding-hint"
+                    >
+                      <span
+                        class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                        data-kbd-chord="true"
+                      >
+                         
+                        <span
+                          class="prc-src-InternalVisuallyHidden-2YaI6"
+                        >
+                          w
+                        </span>
+                        <span
+                          aria-hidden="true"
+                        >
+                          W
+                        </span>
+                      </span>
+                    </kbd>
+                  </span>
                 </span>
                 <button
                   aria-describedby="_r_7_"
@@ -255,15 +291,11 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   aria-hidden="true"
                   class="prc-TooltipV2-Tooltip-tLeuB"
                   data-direction="e"
-<<<<<<< HEAD
-=======
-                  id="_r_7_"
->>>>>>> main
                   popover="auto"
                   role="tooltip"
                 >
                   <span
-                    id="_r_5_"
+                    id="_r_7_"
                   >
                     Filter notifications
                     <span
@@ -421,15 +453,11 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   aria-hidden="true"
                   class="prc-TooltipV2-Tooltip-tLeuB"
                   data-direction="e"
-<<<<<<< HEAD
-=======
-                  id="_r_d_"
->>>>>>> main
                   popover="auto"
                   role="tooltip"
                 >
                   <span
-                    id="_r_b_"
+                    id="_r_d_"
                   >
                     Refresh notifications
                     <span
@@ -468,12 +496,8 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   </span>
                 </span>
                 <button
-<<<<<<< HEAD
-                  aria-describedby="_r_d_"
+                  aria-describedby="_r_f_"
                   aria-label="Settings"
-=======
-                  aria-labelledby="_r_f_"
->>>>>>> main
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
                   data-loading="false"
@@ -504,15 +528,11 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   aria-hidden="true"
                   class="prc-TooltipV2-Tooltip-tLeuB"
                   data-direction="e"
-<<<<<<< HEAD
-=======
-                  id="_r_f_"
->>>>>>> main
                   popover="auto"
                   role="tooltip"
                 >
                   <span
-                    id="_r_d_"
+                    id="_r_f_"
                   >
                     Settings
                     <span
@@ -774,11 +794,47 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_5_"
                 popover="auto"
                 role="tooltip"
               >
-                Participating and watching
+                <span
+                  id="_r_5_"
+                >
+                  Participating and watching
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    w
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        w
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        W
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
               </span>
               <button
                 aria-describedby="_r_7_"
@@ -813,15 +869,11 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-<<<<<<< HEAD
-=======
-                id="_r_7_"
->>>>>>> main
                 popover="auto"
                 role="tooltip"
               >
                 <span
-                  id="_r_5_"
+                  id="_r_7_"
                 >
                   Filter notifications
                   <span
@@ -979,15 +1031,11 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-<<<<<<< HEAD
-=======
-                id="_r_d_"
->>>>>>> main
                 popover="auto"
                 role="tooltip"
               >
                 <span
-                  id="_r_b_"
+                  id="_r_d_"
                 >
                   Refresh notifications
                   <span
@@ -1026,12 +1074,8 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 </span>
               </span>
               <button
-<<<<<<< HEAD
-                aria-describedby="_r_d_"
+                aria-describedby="_r_f_"
                 aria-label="Settings"
-=======
-                aria-labelledby="_r_f_"
->>>>>>> main
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
@@ -1062,15 +1106,11 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-<<<<<<< HEAD
-=======
-                id="_r_f_"
->>>>>>> main
                 popover="auto"
                 role="tooltip"
               >
                 <span
-                  id="_r_d_"
+                  id="_r_f_"
                 >
                   Settings
                   <span

From cd679b7b5a6679b6d89921d8bcfa5d56e00a3ca3 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Tue, 13 Jan 2026 09:25:18 -0500
Subject: [PATCH 07/17] feat: hotkeys

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/renderer/App.test.tsx                     | 184 +++++++++++
 src/renderer/App.tsx                          |   2 +
 src/renderer/components/GlobalShortcuts.tsx   |  51 +++
 src/renderer/components/Sidebar.test.tsx      | 184 +----------
 src/renderer/components/Sidebar.tsx           | 153 ++-------
 .../__snapshots__/Sidebar.test.tsx.snap       |  80 ++++-
 .../settings/SettingsFooter.test.tsx          |  26 +-
 .../components/settings/SettingsFooter.tsx    |  58 ++--
 src/renderer/context/App.tsx                  |   8 +-
 src/renderer/hooks/useNotifications.ts        |   6 +
 src/renderer/hooks/useShortcutActions.ts      | 104 ++++++
 src/renderer/routes/Notifications.tsx         |  11 +-
 src/renderer/routes/Settings.test.tsx         |  18 +-
 .../__snapshots__/Settings.test.tsx.snap      |  80 ++++-
 .../utils/api/graphql/generated/graphql.ts    | 311 +-----------------
 15 files changed, 611 insertions(+), 665 deletions(-)
 create mode 100644 src/renderer/App.test.tsx
 create mode 100644 src/renderer/components/GlobalShortcuts.tsx
 create mode 100644 src/renderer/hooks/useShortcutActions.ts

diff --git a/src/renderer/App.test.tsx b/src/renderer/App.test.tsx
new file mode 100644
index 000000000..0dc3885ff
--- /dev/null
+++ b/src/renderer/App.test.tsx
@@ -0,0 +1,184 @@
+import { render } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
+import { mockSettings } from './__mocks__/state-mocks';
+import { App } from './App';
+import * as comms from './utils/comms';
+
+const navigateMock = jest.fn();
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: () => navigateMock,
+}));
+
+// Provide a mutable mock context for useAppContext consumed by global shortcuts
+let mockContext: {
+  fetchNotifications: jest.Mock;
+  isLoggedIn: boolean;
+  status: 'success' | 'loading' | 'error';
+  settings: typeof mockSettings;
+  updateSetting: jest.Mock;
+  auth: { accounts: Array<{ hostname: string }> };
+  notifications: unknown[];
+} = {
+  fetchNotifications: jest.fn(),
+  isLoggedIn: true,
+  status: 'success',
+  settings: { ...mockSettings, participating: false },
+  updateSetting: jest.fn(),
+  auth: { accounts: [{ hostname: 'github.com' }] },
+  notifications: [],
+};
+jest.mock('./context/App', () => {
+  const actual = jest.requireActual('./context/App');
+  return {
+    ...actual,
+    useAppContext: () => mockContext,
+  };
+});
+
+describe('renderer/App.tsx global keyboard bindings', () => {
+  const fetchNotificationsMock = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockContext = {
+      // minimal shape required by useGlobalShortcuts
+      fetchNotifications: fetchNotificationsMock,
+      isLoggedIn: true,
+      status: 'success',
+      settings: { ...mockSettings, participating: false },
+      updateSetting: jest.fn(),
+      auth: { accounts: [{ hostname: 'github.com' }] },
+      notifications: [],
+    };
+  });
+
+  it('should navigate home when pressing H key', async () => {
+    renderApp();
+    await userEvent.keyboard('h');
+    expect(navigateMock).toHaveBeenCalledTimes(1);
+    expect(navigateMock).toHaveBeenCalledWith('/', { replace: true });
+  });
+
+  it('should refresh notifications when pressing R key', async () => {
+    mockContext.status = 'success';
+    renderApp();
+    await userEvent.keyboard('r');
+    expect(navigateMock).toHaveBeenCalledWith('/', { replace: true });
+    expect(fetchNotificationsMock).toHaveBeenCalledTimes(1);
+  });
+
+  it('should not refresh notifications when pressing R key if status is loading', async () => {
+    mockContext.status = 'loading';
+    renderApp();
+    await userEvent.keyboard('r');
+    expect(fetchNotificationsMock).not.toHaveBeenCalled();
+  });
+
+  it('should toggle settings when pressing S key while logged in', async () => {
+    mockContext.isLoggedIn = true;
+    renderApp();
+    await userEvent.keyboard('s');
+    expect(navigateMock).toHaveBeenCalledTimes(1);
+    expect(navigateMock).toHaveBeenCalledWith('/settings');
+  });
+
+  it('should not toggle settings when pressing S key while logged out', async () => {
+    mockContext.isLoggedIn = false;
+    renderApp();
+    await userEvent.keyboard('s');
+    expect(navigateMock).not.toHaveBeenCalled();
+  });
+
+  it('should toggle filters when pressing F key while logged in', async () => {
+    mockContext.isLoggedIn = true;
+    renderApp();
+    await userEvent.keyboard('f');
+    expect(navigateMock).toHaveBeenCalledWith('/filters');
+  });
+
+  it('should not toggle filters when pressing F key while logged out', async () => {
+    mockContext.isLoggedIn = false;
+    renderApp();
+    await userEvent.keyboard('f');
+    expect(navigateMock).not.toHaveBeenCalled();
+  });
+
+  it('should ignore keyboard shortcuts when typing in an input', async () => {
+    renderApp();
+    const input = document.createElement('input');
+    document.body.appendChild(input);
+    input.focus();
+    navigateMock.mockClear();
+    await userEvent.keyboard('h');
+    expect(navigateMock).not.toHaveBeenCalled();
+    document.body.removeChild(input);
+  });
+
+  it('should ignore keyboard shortcuts when typing in a textarea', async () => {
+    renderApp();
+    const textarea = document.createElement('textarea');
+    document.body.appendChild(textarea);
+    textarea.focus();
+    navigateMock.mockClear();
+    await userEvent.keyboard('r');
+    expect(navigateMock).not.toHaveBeenCalled();
+    expect(fetchNotificationsMock).not.toHaveBeenCalled();
+    document.body.removeChild(textarea);
+  });
+
+  it('should ignore keyboard shortcuts when modifier keys are pressed', async () => {
+    mockContext.status = 'success';
+    renderApp();
+    const event = new KeyboardEvent('keydown', { key: 'h', metaKey: true });
+    navigateMock.mockClear();
+    document.dispatchEvent(event);
+    expect(navigateMock).not.toHaveBeenCalled();
+  });
+
+  it('should work with uppercase key press', async () => {
+    renderApp();
+    await userEvent.keyboard('H');
+    expect(navigateMock).toHaveBeenCalledWith('/', { replace: true });
+  });
+
+  it('should navigate to accounts when pressing A key while logged in', async () => {
+    mockContext.isLoggedIn = true;
+    renderApp('#/settings');
+    // Go to settings first; accounts shortcut only active on settings route
+    await userEvent.keyboard('s');
+    await userEvent.keyboard('a');
+    expect(navigateMock).toHaveBeenCalledWith('/accounts');
+  });
+
+  it('should quit the app when pressing Q key', async () => {
+    const quitAppSpy = jest.spyOn(comms, 'quitApp').mockImplementation();
+    renderApp('#/settings');
+    // Go to settings first; quit shortcut only active on settings route
+    await userEvent.keyboard('s');
+    await userEvent.keyboard('q');
+    expect(quitAppSpy).toHaveBeenCalledTimes(1);
+  });
+
+  it('should not trigger accounts when not on settings route', async () => {
+    mockContext.isLoggedIn = true;
+    renderApp('#/');
+    await userEvent.keyboard('a');
+    expect(navigateMock).not.toHaveBeenCalledWith('/accounts');
+  });
+
+  it('should not quit the app when not on settings route', async () => {
+    const quitAppSpy = jest.spyOn(comms, 'quitApp').mockImplementation();
+    renderApp('#/');
+    await userEvent.keyboard('q');
+    expect(quitAppSpy).not.toHaveBeenCalled();
+  });
+});
+
+function renderApp(initialHash?: string) {
+  if (initialHash) {
+    window.location.hash = initialHash;
+  }
+  return render(<App />);
+}
diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index 3c2b893fc..086e59b9e 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -8,6 +8,7 @@ import {
 
 import { BaseStyles, ThemeProvider } from '@primer/react';
 
+import { GlobalShortcuts } from './components/GlobalShortcuts';
 import { AppLayout } from './components/layout/AppLayout';
 import { AppProvider, useAppContext } from './context/App';
 import { AccountsRoute } from './routes/Accounts';
@@ -37,6 +38,7 @@ export const App = () => {
       <BaseStyles>
         <AppProvider>
           <Router>
+            <GlobalShortcuts />
             <AppLayout>
               <Routes>
                 <Route
diff --git a/src/renderer/components/GlobalShortcuts.tsx b/src/renderer/components/GlobalShortcuts.tsx
new file mode 100644
index 000000000..8789cb4a9
--- /dev/null
+++ b/src/renderer/components/GlobalShortcuts.tsx
@@ -0,0 +1,51 @@
+import { type FC, useEffect } from 'react';
+
+import { useShortcutActions } from '../hooks/useShortcutActions';
+
+/**
+ * Component that registers global keyboard shortcuts for the renderer app.
+ * Mount once inside App, within Router + AppProvider.
+ */
+export const GlobalShortcuts: FC = () => {
+  const { actions, enabled, hotkeys } = useShortcutActions();
+
+  useEffect(() => {
+    const keyToName = Object.entries(hotkeys).reduce<
+      Record<string, keyof typeof actions>
+    >((acc, [name, key]) => {
+      acc[key] = name as keyof typeof actions;
+      return acc;
+    }, {});
+
+    const handler = (event: KeyboardEvent) => {
+      // Ignore if user is typing in an input, textarea, or with modifiers
+      if (
+        event.target instanceof HTMLInputElement ||
+        event.target instanceof HTMLTextAreaElement ||
+        event.metaKey ||
+        event.ctrlKey ||
+        event.altKey
+      ) {
+        return;
+      }
+
+      const key = event.key.toLowerCase();
+      const name = keyToName[key];
+      if (!name) {
+        return;
+      }
+
+      if (enabled[name]) {
+        event.preventDefault();
+        actions[name]();
+      }
+    };
+
+    document.addEventListener('keydown', handler);
+    return () => {
+      document.removeEventListener('keydown', handler);
+    };
+  }, [actions, enabled, hotkeys]);
+
+  return null;
+};
diff --git a/src/renderer/components/Sidebar.test.tsx b/src/renderer/components/Sidebar.test.tsx
index 444ed3151..6114fd557 100644
--- a/src/renderer/components/Sidebar.test.tsx
+++ b/src/renderer/components/Sidebar.test.tsx
@@ -322,187 +322,5 @@ describe('renderer/components/Sidebar.tsx', () => {
 
     expect(quitAppSpy).toHaveBeenCalledTimes(1);
   });
-
-  describe('keyboard bindings', () => {
-    it('should navigate home when pressing H key', async () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-      );
-
-      await userEvent.keyboard('h');
-
-      expect(navigateMock).toHaveBeenCalledTimes(1);
-      expect(navigateMock).toHaveBeenCalledWith('/', { replace: true });
-    });
-
-    it('should refresh notifications when pressing R key', async () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-        {
-          fetchNotifications: fetchNotificationsMock,
-          status: 'success',
-        },
-      );
-
-      await userEvent.keyboard('r');
-
-      expect(navigateMock).toHaveBeenCalledWith('/', { replace: true });
-      expect(fetchNotificationsMock).toHaveBeenCalledTimes(1);
-    });
-
-    it('should not refresh notifications when pressing R key if status is loading', async () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-        {
-          fetchNotifications: fetchNotificationsMock,
-          status: 'loading',
-        },
-      );
-
-      await userEvent.keyboard('r');
-
-      expect(fetchNotificationsMock).not.toHaveBeenCalled();
-    });
-
-    it('should toggle settings when pressing S key while logged in', async () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-        {
-          isLoggedIn: true,
-        },
-      );
-
-      await userEvent.keyboard('s');
-
-      expect(navigateMock).toHaveBeenCalledTimes(1);
-      expect(navigateMock).toHaveBeenCalledWith('/settings');
-    });
-
-    it('should not toggle settings when pressing S key while logged out', async () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-        {
-          isLoggedIn: false,
-        },
-      );
-
-      await userEvent.keyboard('s');
-
-      expect(navigateMock).not.toHaveBeenCalled();
-    });
-
-    it('should toggle filters when pressing F key while logged in', async () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-        {
-          isLoggedIn: true,
-        },
-      );
-
-      await userEvent.keyboard('f');
-
-      expect(navigateMock).toHaveBeenCalledTimes(1);
-      expect(navigateMock).toHaveBeenCalledWith('/filters');
-    });
-
-    it('should not toggle filters when pressing F key while logged out', async () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-        {
-          isLoggedIn: false,
-        },
-      );
-
-      await userEvent.keyboard('f');
-
-      expect(navigateMock).not.toHaveBeenCalled();
-    });
-
-    it('should ignore keyboard shortcuts when typing in an input', async () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-      );
-
-      const input = document.createElement('input');
-      document.body.appendChild(input);
-      input.focus();
-
-      await userEvent.keyboard('h');
-
-      expect(navigateMock).not.toHaveBeenCalled();
-
-      document.body.removeChild(input);
-    });
-
-    it('should ignore keyboard shortcuts when typing in a textarea', async () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-      );
-
-      const textarea = document.createElement('textarea');
-      document.body.appendChild(textarea);
-      textarea.focus();
-
-      await userEvent.keyboard('r');
-
-      expect(navigateMock).not.toHaveBeenCalled();
-      expect(fetchNotificationsMock).not.toHaveBeenCalled();
-
-      document.body.removeChild(textarea);
-    });
-
-    it('should ignore keyboard shortcuts when modifier keys are pressed', async () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-        {
-          fetchNotifications: fetchNotificationsMock,
-          status: 'success',
-        },
-      );
-
-      // Note: userEvent.keyboard with modifier syntax like {Shift>h</Shift>}
-      // would require holding shift, but we test that metaKey/ctrlKey/altKey
-      // prevent action through manual event dispatch
-      const event = new KeyboardEvent('keydown', {
-        key: 'h',
-        metaKey: true,
-      });
-      document.dispatchEvent(event);
-
-      expect(navigateMock).not.toHaveBeenCalled();
-    });
-
-    it('should work with uppercase key press', async () => {
-      renderWithAppContext(
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>,
-      );
-
-      // userEvent.keyboard converts to lowercase automatically
-      await userEvent.keyboard('H');
-
-      expect(navigateMock).toHaveBeenCalledWith('/', { replace: true });
-    });
-  });
+  // Keyboard bindings moved to App.test.tsx
 });
diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx
index 0cb4cee40..81debedcd 100644
--- a/src/renderer/components/Sidebar.tsx
+++ b/src/renderer/components/Sidebar.tsx
@@ -1,5 +1,8 @@
-import { type FC, useCallback, useEffect } from 'react';
-import { useLocation, useNavigate } from 'react-router-dom';
+import type { FC } from 'react';
+
+// import { useLocation, useNavigate } from 'react-router-dom';
+
+// import { useLocation, useNavigate } from 'react-router-dom';
 
 import {
   BellIcon,
@@ -17,6 +20,7 @@ import { IconButton, Stack } from '@primer/react';
 import { APPLICATION } from '../../shared/constants';
 
 import { useAppContext } from '../context/App';
+import { useShortcutActions } from '../hooks/useShortcutActions';
 import { getPrimaryAccountHostname } from '../utils/auth/utils';
 import { quitApp } from '../utils/comms';
 import {
@@ -28,129 +32,23 @@ import { hasActiveFilters } from '../utils/notifications/filters/filter';
 import { LogoIcon } from './icons/LogoIcon';
 
 export const Sidebar: FC = () => {
-  const navigate = useNavigate();
-  const location = useLocation();
+  // const navigate = useNavigate();
+  // const location = useLocation();
 
   const {
-    fetchNotifications,
+    // fetchNotifications,
     isLoggedIn,
-    status,
+    isLoadingState,
     settings,
     auth,
     notificationCount,
     hasUnreadNotifications,
-    updateSetting,
+    // updateSetting,
   } = useAppContext();
 
   const primaryAccountHostname = getPrimaryAccountHostname(auth);
 
-  const goHome = useCallback(() => {
-    navigate('/', { replace: true });
-  }, []);
-
-  const toggleFocusMode = useCallback(() => {
-    updateSetting('participating', !settings.participating);
-  }, [settings.participating, updateSetting]);
-
-  const toggleFilters = useCallback(() => {
-    if (location.pathname.startsWith('/filters')) {
-      navigate('/', { replace: true });
-    } else {
-      navigate('/filters');
-    }
-  }, [location.pathname]);
-
-  const toggleSettings = useCallback(() => {
-    if (location.pathname.startsWith('/settings')) {
-      navigate('/', { replace: true });
-      fetchNotifications();
-    } else {
-      navigate('/settings');
-    }
-  }, [location.pathname, fetchNotifications]);
-
-  const refreshNotifications = useCallback(() => {
-    goHome();
-    fetchNotifications();
-  }, [goHome, fetchNotifications]);
-
-  type ShortcutConfig = {
-    hotkey: string;
-    action: () => void;
-    enabled?: boolean;
-  };
-
-  type ShortcutName =
-    | 'home'
-    | 'refresh'
-    | 'settings'
-    | 'filters'
-    | 'focusedMode';
-
-  const shortcuts: Record<ShortcutName, ShortcutConfig> = {
-    home: {
-      hotkey: 'h',
-      action: goHome,
-      enabled: true,
-    },
-    focusedMode: {
-      hotkey: 'w',
-      action: toggleFocusMode,
-      enabled: status !== 'loading',
-    },
-    filters: {
-      hotkey: 'f',
-      action: toggleFilters,
-      enabled: isLoggedIn,
-    },
-    refresh: {
-      hotkey: 'r',
-      action: refreshNotifications,
-      enabled: status !== 'loading',
-    },
-    settings: {
-      hotkey: 's',
-      action: toggleSettings,
-      enabled: isLoggedIn,
-    },
-  };
-
-  useEffect(() => {
-    const sidebarShortcutHandler = (event: KeyboardEvent) => {
-      // Ignore if user is typing in an input, textarea, or with modifiers
-      if (
-        event.target instanceof HTMLInputElement ||
-        event.target instanceof HTMLTextAreaElement ||
-        event.metaKey ||
-        event.ctrlKey ||
-        event.altKey
-      ) {
-        return;
-      }
-
-      const key = event.key.toLowerCase();
-      const shortcut = Object.values(shortcuts).find((s) => s.hotkey === key);
-
-      if (shortcut && shortcut.enabled !== false) {
-        event.preventDefault();
-        shortcut.action();
-      }
-    };
-
-    document.addEventListener('keydown', sidebarShortcutHandler);
-
-    return () => {
-      document.removeEventListener('keydown', sidebarShortcutHandler);
-    };
-  }, [
-    goHome,
-    toggleSettings,
-    toggleFilters,
-    refreshNotifications,
-    toggleFocusMode,
-    isLoggedIn,
-    status,
-  ]);
+  const { actions, hotkeys, enabled } = useShortcutActions();
 
   return (
     <Stack
@@ -169,8 +67,8 @@ export const Sidebar: FC = () => {
           data-testid="sidebar-home"
           description="Home"
           icon={LogoIcon}
-          keybindingHint={shortcuts.home.hotkey}
-          onClick={() => shortcuts.home.action()}
+          keybindingHint={hotkeys.home}
+          onClick={() => actions.home()}
           size="small"
           tooltipDirection="e"
           variant="invisible"
@@ -198,8 +96,8 @@ export const Sidebar: FC = () => {
                   : 'Participating and watching'
               }
               icon={settings.participating ? CrosshairsIcon : EyeIcon}
-              keybindingHint={shortcuts.focusedMode.hotkey}
-              onClick={() => shortcuts.focusedMode.action()}
+              keybindingHint={hotkeys.focusedMode}
+              onClick={() => actions.focusedMode()}
               size="small"
               tooltipDirection="e"
               variant={settings.participating ? 'primary' : 'invisible'}
@@ -210,8 +108,8 @@ export const Sidebar: FC = () => {
               data-testid="sidebar-filter-notifications"
               description="Filter notifications"
               icon={FilterIcon}
-              keybindingHint={shortcuts.filters.hotkey}
-              onClick={() => shortcuts.filters.action()}
+              keybindingHint={hotkeys.filters}
+              onClick={() => actions.filters()}
               size="small"
               tooltipDirection="e"
               variant={hasActiveFilters(settings) ? 'primary' : 'invisible'}
@@ -250,14 +148,14 @@ export const Sidebar: FC = () => {
           <>
             <IconButton
               aria-label="Refresh"
-              className={status === 'loading' ? 'animate-spin' : ''}
+              className={isLoadingState ? 'animate-spin' : ''}
               data-testid="sidebar-refresh"
               description="Refresh notifications"
-              disabled={status === 'loading'}
+              disabled={!enabled.refresh}
               icon={SyncIcon}
-              keybindingHint={shortcuts.refresh.hotkey}
-              // loading={status === 'loading'}
-              onClick={() => shortcuts.refresh.action()}
+              keybindingHint={hotkeys.refresh}
+              // loading={isLoadingState}
+              onClick={() => actions.refresh()}
               size="small"
               tooltipDirection="e"
               variant="invisible"
@@ -268,8 +166,8 @@ export const Sidebar: FC = () => {
               data-testid="sidebar-settings"
               description="Settings"
               icon={GearIcon}
-              keybindingHint={shortcuts.settings.hotkey}
-              onClick={() => shortcuts.settings.action()}
+              keybindingHint={hotkeys.settings}
+              onClick={() => actions.settings()}
               size="small"
               tooltipDirection="e"
               variant="invisible"
@@ -282,6 +180,7 @@ export const Sidebar: FC = () => {
             aria-label={`Quit ${APPLICATION.NAME}`}
             data-testid="sidebar-quit"
             icon={XCircleIcon}
+            keybindingHint={hotkeys.quit}
             onClick={() => quitApp()}
             size="small"
             tooltipDirection="e"
diff --git a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
index e57c01031..02f26a23f 100644
--- a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
+++ b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
@@ -1569,10 +1569,46 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_ID_"
                 popover="auto"
               >
-                Quit Gitify
+                <span
+                  id="_r_ID_"
+                >
+                  Quit Gitify
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    q
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        q
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        Q
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
               </span>
             </div>
           </div>
@@ -1868,10 +1904,46 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
               data-direction="e"
-              id="_r_ID_"
               popover="auto"
             >
-              Quit Gitify
+              <span
+                id="_r_ID_"
+              >
+                Quit Gitify
+                <span
+                  class="prc-src-InternalVisuallyHidden-2YaI6"
+                >
+                  (
+                  q
+                  )
+                </span>
+              </span>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+              >
+                <kbd
+                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                  data-testid="keybinding-hint"
+                >
+                  <span
+                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                    data-kbd-chord="true"
+                  >
+                     
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      q
+                    </span>
+                    <span
+                      aria-hidden="true"
+                    >
+                      Q
+                    </span>
+                  </span>
+                </kbd>
+              </span>
             </span>
           </div>
         </div>
diff --git a/src/renderer/components/settings/SettingsFooter.test.tsx b/src/renderer/components/settings/SettingsFooter.test.tsx
index 151d31c7d..f8c3d666d 100644
--- a/src/renderer/components/settings/SettingsFooter.test.tsx
+++ b/src/renderer/components/settings/SettingsFooter.test.tsx
@@ -1,5 +1,6 @@
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
+import { MemoryRouter } from 'react-router-dom';
 
 import { renderWithAppContext } from '../../__helpers__/test-utils';
 import * as comms from '../../utils/comms';
@@ -15,7 +16,6 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
   let originalEnv: NodeJS.ProcessEnv;
 
   beforeEach(() => {
-    // Save the original node env state
     originalEnv = process.env;
   });
 
@@ -26,7 +26,11 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
 
   it('should show app version', async () => {
     await act(async () => {
-      renderWithAppContext(<SettingsFooter />);
+      renderWithAppContext(
+        <MemoryRouter initialEntries={['/settings']}>
+          <SettingsFooter />
+        </MemoryRouter>,
+      );
     });
 
     expect(screen.getByTestId('settings-release-notes')).toMatchSnapshot();
@@ -38,7 +42,11 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
       .mockImplementation();
 
     await act(async () => {
-      renderWithAppContext(<SettingsFooter />);
+      renderWithAppContext(
+        <MemoryRouter initialEntries={['/settings']}>
+          <SettingsFooter />
+        </MemoryRouter>,
+      );
     });
 
     await userEvent.click(screen.getByTestId('settings-release-notes'));
@@ -51,7 +59,11 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
 
   it('should open account management', async () => {
     await act(async () => {
-      renderWithAppContext(<SettingsFooter />);
+      renderWithAppContext(
+        <MemoryRouter initialEntries={['/settings']}>
+          <SettingsFooter />
+        </MemoryRouter>,
+      );
     });
 
     await userEvent.click(screen.getByTestId('settings-accounts'));
@@ -63,7 +75,11 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
     const quitAppSpy = jest.spyOn(comms, 'quitApp').mockImplementation();
 
     await act(async () => {
-      renderWithAppContext(<SettingsFooter />);
+      renderWithAppContext(
+        <MemoryRouter initialEntries={['/settings']}>
+          <SettingsFooter />
+        </MemoryRouter>,
+      );
     });
 
     await userEvent.click(screen.getByTestId('settings-quit'));
diff --git a/src/renderer/components/settings/SettingsFooter.tsx b/src/renderer/components/settings/SettingsFooter.tsx
index d7b58eff0..2c4b0c3c4 100644
--- a/src/renderer/components/settings/SettingsFooter.tsx
+++ b/src/renderer/components/settings/SettingsFooter.tsx
@@ -1,18 +1,26 @@
 import { type FC, useEffect, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
+
+// import { useLocation, useNavigate } from 'react-router-dom';
+
+// import { useLocation, useNavigate } from 'react-router-dom';
 
 import { PersonIcon, XCircleIcon } from '@primer/octicons-react';
 import { Button, IconButton, Stack, Tooltip } from '@primer/react';
 
 import { APPLICATION } from '../../../shared/constants';
 
-import { getAppVersion, quitApp } from '../../utils/comms';
+import { useAppContext } from '../../context/App';
+import { useShortcutActions } from '../../hooks/useShortcutActions';
+import { getAppVersion } from '../../utils/comms';
 import { openGitifyReleaseNotes } from '../../utils/links';
 import { Footer } from '../primitives/Footer';
 
 export const SettingsFooter: FC = () => {
   const [appVersion, setAppVersion] = useState<string | null>(null);
-  const navigate = useNavigate();
+  // const navigate = useNavigate();
+  // const location = useLocation();
+  useAppContext();
+  const { actions, hotkeys } = useShortcutActions();
 
   useEffect(() => {
     (async () => {
@@ -34,28 +42,30 @@ export const SettingsFooter: FC = () => {
         </Tooltip>
       </Stack>
       <Stack direction="horizontal" gap="normal">
-        <Tooltip direction="n" text="Accounts">
-          <IconButton
-            aria-label="Accounts"
-            data-testid="settings-accounts"
-            icon={PersonIcon}
-            onClick={() => {
-              navigate('/accounts');
-            }}
-          />
-        </Tooltip>
+        <IconButton
+          aria-label="Accounts"
+          data-testid="settings-accounts"
+          description="Accounts"
+          icon={PersonIcon}
+          keybindingHint={hotkeys.accounts}
+          onClick={() => {
+            actions.accounts();
+          }}
+          tooltipDirection="n"
+        />
 
-        <Tooltip direction="nw" text={`Quit ${APPLICATION.NAME}`}>
-          <IconButton
-            aria-label={`Quit ${APPLICATION.NAME}`}
-            data-testid="settings-quit"
-            icon={XCircleIcon}
-            onClick={() => {
-              quitApp();
-            }}
-            variant="danger"
-          />
-        </Tooltip>
+        <IconButton
+          aria-label={`Quit ${APPLICATION.NAME}`}
+          data-testid="settings-quit"
+          description={`Quit ${APPLICATION.NAME}`}
+          icon={XCircleIcon}
+          keybindingHint={hotkeys.quit}
+          onClick={() => {
+            actions.quit();
+          }}
+          tooltipDirection="nw"
+          variant="danger"
+        />
       </Stack>
     </Footer>
   );
diff --git a/src/renderer/context/App.tsx b/src/renderer/context/App.tsx
index 8035535e4..854f93f6b 100644
--- a/src/renderer/context/App.tsx
+++ b/src/renderer/context/App.tsx
@@ -80,6 +80,8 @@ export interface AppContextState {
   logoutFromAccount: (account: Account) => Promise<void>;
 
   status: Status;
+  isLoadingState: boolean;
+  isErrorState: boolean;
   globalError: GitifyError;
 
   notifications: AccountNotifications[];
@@ -146,6 +148,8 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
 
   const {
     status,
+    isLoadingState,
+    isErrorState,
     globalError,
 
     notifications,
@@ -304,7 +308,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
     setUseUnreadActiveIcon(settings.useUnreadActiveIcon);
     setUseAlternateIdleIcon(settings.useAlternateIdleIcon);
 
-    const trayCount = status === 'error' ? -1 : notificationCount;
+    const trayCount = isErrorState ? -1 : notificationCount;
     setTrayIconColorAndTitle(trayCount, settings);
   }, [
     settings.showNotificationsCountInTray,
@@ -488,6 +492,8 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
       logoutFromAccount,
 
       status,
+      isLoadingState,
+      isErrorState,
       globalError,
 
       notifications,
diff --git a/src/renderer/hooks/useNotifications.ts b/src/renderer/hooks/useNotifications.ts
index a13d287d5..c6cda98da 100644
--- a/src/renderer/hooks/useNotifications.ts
+++ b/src/renderer/hooks/useNotifications.ts
@@ -31,6 +31,8 @@ import { getNewNotifications } from '../utils/notifications/utils';
 
 interface NotificationsState {
   status: Status;
+  isLoadingState: boolean;
+  isErrorState: boolean;
   globalError: GitifyError;
 
   notifications: AccountNotifications[];
@@ -59,6 +61,8 @@ interface NotificationsState {
 export const useNotifications = (): NotificationsState => {
   const [status, setStatus] = useState<Status>('success');
   const [globalError, setGlobalError] = useState<GitifyError>();
+  const isLoadingState = status === 'loading';
+  const isErrorState = status === 'error';
 
   const [notifications, setNotifications] = useState<AccountNotifications[]>(
     [],
@@ -243,6 +247,8 @@ export const useNotifications = (): NotificationsState => {
 
   return {
     status,
+    isLoadingState,
+    isErrorState,
     globalError,
 
     notifications,
diff --git a/src/renderer/hooks/useShortcutActions.ts b/src/renderer/hooks/useShortcutActions.ts
new file mode 100644
index 000000000..afaf7476c
--- /dev/null
+++ b/src/renderer/hooks/useShortcutActions.ts
@@ -0,0 +1,104 @@
+import { useMemo } from 'react';
+import { useLocation, useNavigate } from 'react-router-dom';
+
+import { useAppContext } from '../context/App';
+import { quitApp } from '../utils/comms';
+
+export type ShortcutName =
+  | 'home'
+  | 'refresh'
+  | 'settings'
+  | 'filters'
+  | 'focusedMode'
+  | 'quit'
+  | 'accounts';
+
+type ShortcutActions = Record<ShortcutName, () => void>;
+type ShortcutEnabled = Record<ShortcutName, boolean>;
+type ShortcutHotkeys = Record<ShortcutName, string>;
+
+/**
+ * Centralized shortcut actions + enabled state + hotkeys.
+ * Used by both the global shortcuts component and UI buttons to avoid duplication.
+ */
+export function useShortcutActions(): {
+  actions: ShortcutActions;
+  enabled: ShortcutEnabled;
+  hotkeys: ShortcutHotkeys;
+} {
+  const navigate = useNavigate();
+  const location = useLocation();
+  const {
+    fetchNotifications,
+    isLoggedIn,
+    isLoadingState,
+    settings,
+    updateSetting,
+  } = useAppContext();
+
+  const isOnFiltersRoute = location.pathname.startsWith('/filters');
+  const isOnSettingsRoute = location.pathname.startsWith('/settings');
+
+  const actions: ShortcutActions = useMemo(() => {
+    return {
+      home: () => navigate('/', { replace: true }),
+      focusedMode: () =>
+        updateSetting('participating', !settings.participating),
+      filters: () => {
+        if (isOnFiltersRoute) {
+          navigate('/', { replace: true });
+        } else {
+          navigate('/filters');
+        }
+      },
+      refresh: () => {
+        if (isLoadingState) {
+          return;
+        }
+        navigate('/', { replace: true });
+        void fetchNotifications();
+      },
+      settings: () => {
+        if (isOnSettingsRoute) {
+          navigate('/', { replace: true });
+          void fetchNotifications();
+        } else {
+          navigate('/settings');
+        }
+      },
+      accounts: () => navigate('/accounts'),
+      quit: () => quitApp(),
+    };
+  }, [
+    settings.participating,
+    isLoadingState,
+    isOnSettingsRoute,
+    isOnFiltersRoute,
+    fetchNotifications,
+    updateSetting,
+  ]);
+
+  const enabled: ShortcutEnabled = useMemo(() => {
+    return {
+      home: true,
+      focusedMode: !isLoadingState,
+      filters: isLoggedIn,
+      refresh: !isLoadingState,
+      settings: isLoggedIn,
+      accounts: isLoggedIn && isOnSettingsRoute,
+      quit: !isLoggedIn || isOnSettingsRoute,
+    };
+  }, [isLoggedIn, isOnSettingsRoute, isLoadingState]);
+
+  const hotkeys: ShortcutHotkeys = {
+    home: 'h',
+    focusedMode: 'w',
+    filters: 'f',
+    refresh: 'r',
+    settings: 's',
+    accounts: 'a',
+    quit: 'q',
+  };
+
+  return { actions, enabled, hotkeys };
+}
diff --git a/src/renderer/routes/Notifications.tsx b/src/renderer/routes/Notifications.tsx
index 04aabcc1a..dd4c6e70b 100644
--- a/src/renderer/routes/Notifications.tsx
+++ b/src/renderer/routes/Notifications.tsx
@@ -9,8 +9,13 @@ import { useAppContext } from '../context/App';
 import { getAccountUUID } from '../utils/auth/utils';
 
 export const NotificationsRoute: FC = () => {
-  const { notifications, status, globalError, settings, hasNotifications } =
-    useAppContext();
+  const {
+    notifications,
+    isErrorState,
+    globalError,
+    settings,
+    hasNotifications,
+  } = useAppContext();
 
   const hasMultipleAccounts = useMemo(
     () => notifications.length > 1,
@@ -22,7 +27,7 @@ export const NotificationsRoute: FC = () => {
     [notifications],
   );
 
-  if (status === 'error') {
+  if (isErrorState) {
     return <Oops error={globalError} />;
   }
 
diff --git a/src/renderer/routes/Settings.test.tsx b/src/renderer/routes/Settings.test.tsx
index 027e2481f..9e9cebefc 100644
--- a/src/renderer/routes/Settings.test.tsx
+++ b/src/renderer/routes/Settings.test.tsx
@@ -1,5 +1,6 @@
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
+import { MemoryRouter } from 'react-router-dom';
 
 import { renderWithAppContext } from '../__helpers__/test-utils';
 import { SettingsRoute } from './Settings';
@@ -19,7 +20,11 @@ describe('renderer/routes/Settings.tsx', () => {
 
   it('should render itself & its children', async () => {
     await act(async () => {
-      renderWithAppContext(<SettingsRoute />);
+      renderWithAppContext(
+        <MemoryRouter initialEntries={['/settings']}>
+          <SettingsRoute />
+        </MemoryRouter>,
+      );
     });
 
     expect(screen.getByTestId('settings')).toMatchSnapshot();
@@ -27,9 +32,14 @@ describe('renderer/routes/Settings.tsx', () => {
 
   it('should go back by pressing the icon', async () => {
     await act(async () => {
-      renderWithAppContext(<SettingsRoute />, {
-        fetchNotifications: fetchNotificationsMock,
-      });
+      renderWithAppContext(
+        <MemoryRouter initialEntries={['/settings']}>
+          <SettingsRoute />
+        </MemoryRouter>,
+        {
+          fetchNotifications: fetchNotificationsMock,
+        },
+      );
     });
 
     await userEvent.click(screen.getByTestId('header-nav-back'));
diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index a9a21cfef..6e0a2483e 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -2068,11 +2068,47 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-tLeuB"
           data-direction="n"
-          id="_r_ID_"
           popover="auto"
           role="tooltip"
         >
-          Accounts
+          <span
+            id="_r_ID_"
+          >
+            Accounts
+            <span
+              class="prc-src-InternalVisuallyHidden-2YaI6"
+            >
+              (
+              a
+              )
+            </span>
+          </span>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          >
+            <kbd
+              class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+              data-testid="keybinding-hint"
+            >
+              <span
+                class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                data-kbd-chord="true"
+              >
+                 
+                <span
+                  class="prc-src-InternalVisuallyHidden-2YaI6"
+                >
+                  a
+                </span>
+                <span
+                  aria-hidden="true"
+                >
+                  A
+                </span>
+              </span>
+            </kbd>
+          </span>
         </span>
         <button
           aria-describedby="_r_ID_"
@@ -2107,11 +2143,47 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-tLeuB"
           data-direction="nw"
-          id="_r_ID_"
           popover="auto"
           role="tooltip"
         >
-          Quit Gitify
+          <span
+            id="_r_ID_"
+          >
+            Quit Gitify
+            <span
+              class="prc-src-InternalVisuallyHidden-2YaI6"
+            >
+              (
+              q
+              )
+            </span>
+          </span>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          >
+            <kbd
+              class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+              data-testid="keybinding-hint"
+            >
+              <span
+                class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                data-kbd-chord="true"
+              >
+                 
+                <span
+                  class="prc-src-InternalVisuallyHidden-2YaI6"
+                >
+                  q
+                </span>
+                <span
+                  aria-hidden="true"
+                >
+                  Q
+                </span>
+              </span>
+            </kbd>
+          </span>
         </span>
       </div>
     </div>
diff --git a/src/renderer/utils/api/graphql/generated/graphql.ts b/src/renderer/utils/api/graphql/generated/graphql.ts
index fda34b59c..27c139003 100644
--- a/src/renderer/utils/api/graphql/generated/graphql.ts
+++ b/src/renderer/utils/api/graphql/generated/graphql.ts
@@ -4662,60 +4662,6 @@ export type CreateSponsorshipsPayload = {
   sponsorables?: Maybe<Array<Sponsorable>>;
 };
 
-/** Autogenerated input type of CreateTeamDiscussion */
-export type CreateTeamDiscussionInput = {
-  /**
-   * The content of the discussion. This field is required.
-   *
-   * **Upcoming Change on 2024-07-01 UTC**
-   * **Description:** `body` will be removed. Follow the guide at https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/ to find a suitable replacement.
-   * **Reason:** The Team Discussions feature is deprecated in favor of Organization Discussions.
-   *
-   */
-  body?: InputMaybe<Scalars['String']['input']>;
-  /** A unique identifier for the client performing the mutation. */
-  clientMutationId?: InputMaybe<Scalars['String']['input']>;
-  /**
-   * If true, restricts the visibility of this discussion to team members and organization owners. If false or not specified, allows any organization member to view this discussion.
-   *
-   * **Upcoming Change on 2024-07-01 UTC**
-   * **Description:** `private` will be removed. Follow the guide at https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/ to find a suitable replacement.
-   * **Reason:** The Team Discussions feature is deprecated in favor of Organization Discussions.
-   *
-   */
-  private?: InputMaybe<Scalars['Boolean']['input']>;
-  /**
-   * The ID of the team to which the discussion belongs. This field is required.
-   *
-   * **Upcoming Change on 2024-07-01 UTC**
-   * **Description:** `teamId` will be removed. Follow the guide at https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/ to find a suitable replacement.
-   * **Reason:** The Team Discussions feature is deprecated in favor of Organization Discussions.
-   *
-   */
-  teamId?: InputMaybe<Scalars['ID']['input']>;
-  /**
-   * The title of the discussion. This field is required.
-   *
-   * **Upcoming Change on 2024-07-01 UTC**
-   * **Description:** `title` will be removed. Follow the guide at https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/ to find a suitable replacement.
-   * **Reason:** The Team Discussions feature is deprecated in favor of Organization Discussions.
-   *
-   */
-  title?: InputMaybe<Scalars['String']['input']>;
-};
-
-/** Autogenerated return type of CreateTeamDiscussion. */
-export type CreateTeamDiscussionPayload = {
-  __typename?: 'CreateTeamDiscussionPayload';
-  /** A unique identifier for the client performing the mutation. */
-  clientMutationId?: Maybe<Scalars['String']['output']>;
-  /**
-   * The new discussion.
-   * @deprecated The Team Discussions feature is deprecated in favor of Organization Discussions. Follow the guide at https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/ to find a suitable replacement. Removal on 2024-07-01 UTC.
-   */
-  teamDiscussion?: Maybe<TeamDiscussion>;
-};
-
 /** Autogenerated input type of CreateUserList */
 export type CreateUserListInput = {
   /** A unique identifier for the client performing the mutation. */
@@ -5535,21 +5481,6 @@ export type DeleteRepositoryRulesetPayload = {
   clientMutationId?: Maybe<Scalars['String']['output']>;
 };
 
-/** Autogenerated input type of DeleteTeamDiscussion */
-export type DeleteTeamDiscussionInput = {
-  /** A unique identifier for the client performing the mutation. */
-  clientMutationId?: InputMaybe<Scalars['String']['input']>;
-  /** The discussion ID to delete. */
-  id: Scalars['ID']['input'];
-};
-
-/** Autogenerated return type of DeleteTeamDiscussion. */
-export type DeleteTeamDiscussionPayload = {
-  __typename?: 'DeleteTeamDiscussionPayload';
-  /** A unique identifier for the client performing the mutation. */
-  clientMutationId?: Maybe<Scalars['String']['output']>;
-};
-
 /** Autogenerated input type of DeleteUserList */
 export type DeleteUserListInput = {
   /** A unique identifier for the client performing the mutation. */
@@ -12313,8 +12244,6 @@ export type Mutation = {
   createSponsorship?: Maybe<CreateSponsorshipPayload>;
   /** Make many sponsorships for different sponsorable users or organizations at once. Can only sponsor those who have a public GitHub Sponsors profile. */
   createSponsorships?: Maybe<CreateSponsorshipsPayload>;
-  /** Creates a new team discussion. */
-  createTeamDiscussion?: Maybe<CreateTeamDiscussionPayload>;
   /** Creates a new user list. */
   createUserList?: Maybe<CreateUserListPayload>;
   /** Rejects a suggested topic for the repository. */
@@ -12378,8 +12307,6 @@ export type Mutation = {
   deleteRepositoryCustomProperty?: Maybe<DeleteRepositoryCustomPropertyPayload>;
   /** Delete a repository ruleset */
   deleteRepositoryRuleset?: Maybe<DeleteRepositoryRulesetPayload>;
-  /** Deletes a team discussion. */
-  deleteTeamDiscussion?: Maybe<DeleteTeamDiscussionPayload>;
   /** Deletes a user list. */
   deleteUserList?: Maybe<DeleteUserListPayload>;
   /** Deletes a verifiable domain. */
@@ -12714,8 +12641,6 @@ export type Mutation = {
   updateSponsorshipPreferences?: Maybe<UpdateSponsorshipPreferencesPayload>;
   /** Updates the state for subscribable subjects. */
   updateSubscription?: Maybe<UpdateSubscriptionPayload>;
-  /** Updates a team discussion. */
-  updateTeamDiscussion?: Maybe<UpdateTeamDiscussionPayload>;
   /** Updates team review assignment. */
   updateTeamReviewAssignment?: Maybe<UpdateTeamReviewAssignmentPayload>;
   /** Update team repository. */
@@ -13181,12 +13106,6 @@ export type MutationCreateSponsorshipsArgs = {
 };
 
 
-/** The root query for implementing GraphQL mutations. */
-export type MutationCreateTeamDiscussionArgs = {
-  input: CreateTeamDiscussionInput;
-};
-
-
 /** The root query for implementing GraphQL mutations. */
 export type MutationCreateUserListArgs = {
   input: CreateUserListInput;
@@ -13349,12 +13268,6 @@ export type MutationDeleteRepositoryRulesetArgs = {
 };
 
 
-/** The root query for implementing GraphQL mutations. */
-export type MutationDeleteTeamDiscussionArgs = {
-  input: DeleteTeamDiscussionInput;
-};
-
-
 /** The root query for implementing GraphQL mutations. */
 export type MutationDeleteUserListArgs = {
   input: DeleteUserListInput;
@@ -14225,12 +14138,6 @@ export type MutationUpdateSubscriptionArgs = {
 };
 
 
-/** The root query for implementing GraphQL mutations. */
-export type MutationUpdateTeamDiscussionArgs = {
-  input: UpdateTeamDiscussionInput;
-};
-
-
 /** The root query for implementing GraphQL mutations. */
 export type MutationUpdateTeamReviewAssignmentArgs = {
   input: UpdateTeamReviewAssignmentInput;
@@ -31254,14 +31161,6 @@ export type Team = MemberStatusable & Node & Subscribable & {
   databaseId?: Maybe<Scalars['Int']['output']>;
   /** The description of the team. */
   description?: Maybe<Scalars['String']['output']>;
-  /** Find a team discussion by its number. */
-  discussion?: Maybe<TeamDiscussion>;
-  /** A list of team discussions. */
-  discussions: TeamDiscussionConnection;
-  /** The HTTP path for team discussions */
-  discussionsResourcePath: Scalars['URI']['output'];
-  /** The HTTP URL for team discussions */
-  discussionsUrl: Scalars['URI']['output'];
   /** The HTTP path for editing this team */
   editTeamResourcePath: Scalars['URI']['output'];
   /** The HTTP URL for editing this team */
@@ -31358,23 +31257,6 @@ export type TeamChildTeamsArgs = {
 };
 
 
-/** A team of users in an organization. */
-export type TeamDiscussionArgs = {
-  number: Scalars['Int']['input'];
-};
-
-
-/** A team of users in an organization. */
-export type TeamDiscussionsArgs = {
-  after?: InputMaybe<Scalars['String']['input']>;
-  before?: InputMaybe<Scalars['String']['input']>;
-  first?: InputMaybe<Scalars['Int']['input']>;
-  isPinned?: InputMaybe<Scalars['Boolean']['input']>;
-  last?: InputMaybe<Scalars['Int']['input']>;
-  orderBy?: InputMaybe<TeamDiscussionOrder>;
-};
-
-
 /** A team of users in an organization. */
 export type TeamInvitationsArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
@@ -31824,172 +31706,6 @@ export type TeamConnection = {
   totalCount: Scalars['Int']['output'];
 };
 
-/** A team discussion. */
-export type TeamDiscussion = Comment & Deletable & Node & Reactable & Subscribable & UniformResourceLocatable & Updatable & UpdatableComment & {
-  __typename?: 'TeamDiscussion';
-  /** The actor who authored the comment. */
-  author?: Maybe<Actor>;
-  /**
-   * Author's association with the discussion's team.
-   * @deprecated The Team Discussions feature is deprecated in favor of Organization Discussions. Follow the guide at https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/ to find a suitable replacement. Removal on 2024-07-01 UTC.
-   */
-  authorAssociation: CommentAuthorAssociation;
-  /** The body as Markdown. */
-  body: Scalars['String']['output'];
-  /** The body rendered to HTML. */
-  bodyHTML: Scalars['HTML']['output'];
-  /** The body rendered to text. */
-  bodyText: Scalars['String']['output'];
-  /**
-   * Identifies the discussion body hash.
-   * @deprecated The Team Discussions feature is deprecated in favor of Organization Discussions. Follow the guide at https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/ to find a suitable replacement. Removal on 2024-07-01 UTC.
-   */
-  bodyVersion: Scalars['String']['output'];
-  /**
-   * The HTTP path for discussion comments
-   * @deprecated The Team Discussions feature is deprecated in favor of Organization Discussions. Follow the guide at https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/ to find a suitable replacement. Removal on 2024-07-01 UTC.
-   */
-  commentsResourcePath: Scalars['URI']['output'];
-  /**
-   * The HTTP URL for discussion comments
-   * @deprecated The Team Discussions feature is deprecated in favor of Organization Discussions. Follow the guide at https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/ to find a suitable replacement. Removal on 2024-07-01 UTC.
-   */
-  commentsUrl: Scalars['URI']['output'];
-  /** Identifies the date and time when the object was created. */
-  createdAt: Scalars['DateTime']['output'];
-  /** Check if this comment was created via an email reply. */
-  createdViaEmail: Scalars['Boolean']['output'];
-  /** Identifies the primary key from the database. */
-  databaseId?: Maybe<Scalars['Int']['output']>;
-  /** The actor who edited the comment. */
-  editor?: Maybe<Actor>;
-  /** The Node ID of the TeamDiscussion object */
-  id: Scalars['ID']['output'];
-  /** Check if this comment was edited and includes an edit with the creation data */
-  includesCreatedEdit: Scalars['Boolean']['output'];
-  /**
-   * Whether or not the discussion is pinned.
-   * @deprecated The Team Discussions feature is deprecated in favor of Organization Discussions. Follow the guide at https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/ to find a suitable replacement. Removal on 2024-07-01 UTC.
-   */
-  isPinned: Scalars['Boolean']['output'];
-  /**
-   * Whether or not the discussion is only visible to team members and organization owners.
-   * @deprecated The Team Discussions feature is deprecated in favor of Organization Discussions. Follow the guide at https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/ to find a suitable replacement. Removal on 2024-07-01 UTC.
-   */
-  isPrivate: Scalars['Boolean']['output'];
-  /** The moment the editor made the last edit */
-  lastEditedAt?: Maybe<Scalars['DateTime']['output']>;
-  /**
-   * Identifies the discussion within its team.
-   * @deprecated The Team Discussions feature is deprecated in favor of Organization Discussions. Follow the guide at https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/ to find a suitable replacement. Removal on 2024-07-01 UTC.
-   */
-  number: Scalars['Int']['output'];
-  /** Identifies when the comment was published at. */
-  publishedAt?: Maybe<Scalars['DateTime']['output']>;
-  /** A list of reactions grouped by content left on the subject. */
-  reactionGroups?: Maybe<Array<ReactionGroup>>;
-  /** A list of Reactions left on the Issue. */
-  reactions: ReactionConnection;
-  /**
-   * The HTTP path for this discussion
-   * @deprecated The Team Discussions feature is deprecated in favor of Organization Discussions. Follow the guide at https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/ to find a suitable replacement. Removal on 2024-07-01 UTC.
-   */
-  resourcePath: Scalars['URI']['output'];
-  /**
-   * The team that defines the context of this discussion.
-   * @deprecated The Team Discussions feature is deprecated in favor of Organization Discussions. Follow the guide at https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/ to find a suitable replacement. Removal on 2024-07-01 UTC.
-   */
-  team: Team;
-  /**
-   * The title of the discussion
-   * @deprecated The Team Discussions feature is deprecated in favor of Organization Discussions. Follow the guide at https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/ to find a suitable replacement. Removal on 2024-07-01 UTC.
-   */
-  title: Scalars['String']['output'];
-  /** Identifies the date and time when the object was last updated. */
-  updatedAt: Scalars['DateTime']['output'];
-  /**
-   * The HTTP URL for this discussion
-   * @deprecated The Team Discussions feature is deprecated in favor of Organization Discussions. Follow the guide at https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/ to find a suitable replacement. Removal on 2024-07-01 UTC.
-   */
-  url: Scalars['URI']['output'];
-  /** A list of edits to this content. */
-  userContentEdits?: Maybe<UserContentEditConnection>;
-  /** Check if the current viewer can delete this object. */
-  viewerCanDelete: Scalars['Boolean']['output'];
-  /**
-   * Whether or not the current viewer can pin this discussion.
-   * @deprecated The Team Discussions feature is deprecated in favor of Organization Discussions. Follow the guide at https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/ to find a suitable replacement. Removal on 2024-07-01 UTC.
-   */
-  viewerCanPin: Scalars['Boolean']['output'];
-  /** Can user react to this subject */
-  viewerCanReact: Scalars['Boolean']['output'];
-  /** Check if the viewer is able to change their subscription status for the repository. */
-  viewerCanSubscribe: Scalars['Boolean']['output'];
-  /** Check if the current viewer can update this object. */
-  viewerCanUpdate: Scalars['Boolean']['output'];
-  /** Reasons why the current viewer can not update this comment. */
-  viewerCannotUpdateReasons: Array<CommentCannotUpdateReason>;
-  /** Did the viewer author this comment. */
-  viewerDidAuthor: Scalars['Boolean']['output'];
-  /** Identifies if the viewer is watching, not watching, or ignoring the subscribable entity. */
-  viewerSubscription?: Maybe<SubscriptionState>;
-};
-
-
-/** A team discussion. */
-export type TeamDiscussionReactionsArgs = {
-  after?: InputMaybe<Scalars['String']['input']>;
-  before?: InputMaybe<Scalars['String']['input']>;
-  content?: InputMaybe<ReactionContent>;
-  first?: InputMaybe<Scalars['Int']['input']>;
-  last?: InputMaybe<Scalars['Int']['input']>;
-  orderBy?: InputMaybe<ReactionOrder>;
-};
-
-
-/** A team discussion. */
-export type TeamDiscussionUserContentEditsArgs = {
-  after?: InputMaybe<Scalars['String']['input']>;
-  before?: InputMaybe<Scalars['String']['input']>;
-  first?: InputMaybe<Scalars['Int']['input']>;
-  last?: InputMaybe<Scalars['Int']['input']>;
-};
-
-/** The connection type for TeamDiscussion. */
-export type TeamDiscussionConnection = {
-  __typename?: 'TeamDiscussionConnection';
-  /** A list of edges. */
-  edges?: Maybe<Array<Maybe<TeamDiscussionEdge>>>;
-  /** A list of nodes. */
-  nodes?: Maybe<Array<Maybe<TeamDiscussion>>>;
-  /** Information to aid in pagination. */
-  pageInfo: PageInfo;
-  /** Identifies the total count of items in the connection. */
-  totalCount: Scalars['Int']['output'];
-};
-
-/** An edge in a connection. */
-export type TeamDiscussionEdge = {
-  __typename?: 'TeamDiscussionEdge';
-  /** A cursor for use in pagination. */
-  cursor: Scalars['String']['output'];
-  /** The item at the end of the edge. */
-  node?: Maybe<TeamDiscussion>;
-};
-
-/** Ways in which team discussion connections can be ordered. */
-export type TeamDiscussionOrder = {
-  /** The direction in which to order nodes. */
-  direction: OrderDirection;
-  /** The field by which to order nodes. */
-  field: TeamDiscussionOrderField;
-};
-
-/** Properties by which team discussion connections can be ordered. */
-export type TeamDiscussionOrderField =
-  /** Allows chronological ordering of team discussions. */
-  | 'CREATED_AT';
-
 /** An edge in a connection. */
 export type TeamEdge = {
   __typename?: 'TeamEdge';
@@ -34446,31 +34162,6 @@ export type UpdateSubscriptionPayload = {
   subscribable?: Maybe<Subscribable>;
 };
 
-/** Autogenerated input type of UpdateTeamDiscussion */
-export type UpdateTeamDiscussionInput = {
-  /** The updated text of the discussion. */
-  body?: InputMaybe<Scalars['String']['input']>;
-  /** The current version of the body content. If provided, this update operation will be rejected if the given version does not match the latest version on the server. */
-  bodyVersion?: InputMaybe<Scalars['String']['input']>;
-  /** A unique identifier for the client performing the mutation. */
-  clientMutationId?: InputMaybe<Scalars['String']['input']>;
-  /** The Node ID of the discussion to modify. */
-  id: Scalars['ID']['input'];
-  /** If provided, sets the pinned state of the updated discussion. */
-  pinned?: InputMaybe<Scalars['Boolean']['input']>;
-  /** The updated title of the discussion. */
-  title?: InputMaybe<Scalars['String']['input']>;
-};
-
-/** Autogenerated return type of UpdateTeamDiscussion. */
-export type UpdateTeamDiscussionPayload = {
-  __typename?: 'UpdateTeamDiscussionPayload';
-  /** A unique identifier for the client performing the mutation. */
-  clientMutationId?: Maybe<Scalars['String']['output']>;
-  /** The updated discussion. */
-  teamDiscussion?: Maybe<TeamDiscussion>;
-};
-
 /** Autogenerated input type of UpdateTeamReviewAssignment */
 export type UpdateTeamReviewAssignmentInput = {
   /** The algorithm to use for review assignment */
@@ -35892,7 +35583,7 @@ export type WorkflowsParametersInput = {
   workflows: Array<WorkflowFileReferenceInput>;
 };
 
-export type _Entity = Issue;
+export type _Entity = Issue | Repository;
 
 type AuthorFields_Bot_Fragment = { __typename?: 'Bot', login: string, htmlUrl: any, avatarUrl: any, type: 'Bot' };
 

From dbac4542b4a10414b71007ec5017ac023ea76af9 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Tue, 13 Jan 2026 09:41:21 -0500
Subject: [PATCH 08/17] feat: hotkeys

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/renderer/components/Sidebar.tsx      | 11 +++--------
 src/renderer/context/App.tsx             |  8 +-------
 src/renderer/hooks/useNotifications.ts   |  6 ------
 src/renderer/hooks/useShortcutActions.ts | 20 ++++++++------------
 src/renderer/routes/Notifications.tsx    | 11 +++--------
 5 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx
index 81debedcd..b90c222e8 100644
--- a/src/renderer/components/Sidebar.tsx
+++ b/src/renderer/components/Sidebar.tsx
@@ -32,18 +32,13 @@ import { hasActiveFilters } from '../utils/notifications/filters/filter';
 import { LogoIcon } from './icons/LogoIcon';
 
 export const Sidebar: FC = () => {
-  // const navigate = useNavigate();
-  // const location = useLocation();
-
   const {
-    // fetchNotifications,
+    status,
     isLoggedIn,
-    isLoadingState,
     settings,
     auth,
     notificationCount,
     hasUnreadNotifications,
-    // updateSetting,
   } = useAppContext();
 
   const primaryAccountHostname = getPrimaryAccountHostname(auth);
@@ -148,13 +143,13 @@ export const Sidebar: FC = () => {
           <>
             <IconButton
               aria-label="Refresh"
-              className={isLoadingState ? 'animate-spin' : ''}
+              className={status === 'loading' ? 'animate-spin' : ''}
               data-testid="sidebar-refresh"
               description="Refresh notifications"
               disabled={!enabled.refresh}
               icon={SyncIcon}
               keybindingHint={hotkeys.refresh}
-              // loading={isLoadingState}
+              // loading={status === 'loading'}
               onClick={() => actions.refresh()}
               size="small"
               tooltipDirection="e"
diff --git a/src/renderer/context/App.tsx b/src/renderer/context/App.tsx
index 854f93f6b..8035535e4 100644
--- a/src/renderer/context/App.tsx
+++ b/src/renderer/context/App.tsx
@@ -80,8 +80,6 @@ export interface AppContextState {
   logoutFromAccount: (account: Account) => Promise<void>;
 
   status: Status;
-  isLoadingState: boolean;
-  isErrorState: boolean;
   globalError: GitifyError;
 
   notifications: AccountNotifications[];
@@ -148,8 +146,6 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
 
   const {
     status,
-    isLoadingState,
-    isErrorState,
     globalError,
 
     notifications,
@@ -308,7 +304,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
     setUseUnreadActiveIcon(settings.useUnreadActiveIcon);
     setUseAlternateIdleIcon(settings.useAlternateIdleIcon);
 
-    const trayCount = isErrorState ? -1 : notificationCount;
+    const trayCount = status === 'error' ? -1 : notificationCount;
     setTrayIconColorAndTitle(trayCount, settings);
   }, [
     settings.showNotificationsCountInTray,
@@ -492,8 +488,6 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
       logoutFromAccount,
 
       status,
-      isLoadingState,
-      isErrorState,
       globalError,
 
       notifications,
diff --git a/src/renderer/hooks/useNotifications.ts b/src/renderer/hooks/useNotifications.ts
index c6cda98da..a13d287d5 100644
--- a/src/renderer/hooks/useNotifications.ts
+++ b/src/renderer/hooks/useNotifications.ts
@@ -31,8 +31,6 @@ import { getNewNotifications } from '../utils/notifications/utils';
 
 interface NotificationsState {
   status: Status;
-  isLoadingState: boolean;
-  isErrorState: boolean;
   globalError: GitifyError;
 
   notifications: AccountNotifications[];
@@ -61,8 +59,6 @@ interface NotificationsState {
 export const useNotifications = (): NotificationsState => {
   const [status, setStatus] = useState<Status>('success');
   const [globalError, setGlobalError] = useState<GitifyError>();
-  const isLoadingState = status === 'loading';
-  const isErrorState = status === 'error';
 
   const [notifications, setNotifications] = useState<AccountNotifications[]>(
     [],
@@ -247,8 +243,6 @@ export const useNotifications = (): NotificationsState => {
 
   return {
     status,
-    isLoadingState,
-    isErrorState,
     globalError,
 
     notifications,
diff --git a/src/renderer/hooks/useShortcutActions.ts b/src/renderer/hooks/useShortcutActions.ts
index afaf7476c..23b42c1df 100644
--- a/src/renderer/hooks/useShortcutActions.ts
+++ b/src/renderer/hooks/useShortcutActions.ts
@@ -28,16 +28,12 @@ export function useShortcutActions(): {
 } {
   const navigate = useNavigate();
   const location = useLocation();
-  const {
-    fetchNotifications,
-    isLoggedIn,
-    isLoadingState,
-    settings,
-    updateSetting,
-  } = useAppContext();
+  const { fetchNotifications, isLoggedIn, status, settings, updateSetting } =
+    useAppContext();
 
   const isOnFiltersRoute = location.pathname.startsWith('/filters');
   const isOnSettingsRoute = location.pathname.startsWith('/settings');
+  const isLoading = status === 'loading';
 
   const actions: ShortcutActions = useMemo(() => {
     return {
@@ -52,7 +48,7 @@ export function useShortcutActions(): {
         }
       },
       refresh: () => {
-        if (isLoadingState) {
+        if (isLoading) {
           return;
         }
         navigate('/', { replace: true });
@@ -71,7 +67,7 @@ export function useShortcutActions(): {
     };
   }, [
     settings.participating,
-    isLoadingState,
+    isLoading,
     isOnSettingsRoute,
     isOnFiltersRoute,
     fetchNotifications,
@@ -81,14 +77,14 @@ export function useShortcutActions(): {
   const enabled: ShortcutEnabled = useMemo(() => {
     return {
       home: true,
-      focusedMode: !isLoadingState,
+      focusedMode: !isLoading,
       filters: isLoggedIn,
-      refresh: !isLoadingState,
+      refresh: !isLoading,
       settings: isLoggedIn,
       accounts: isLoggedIn && isOnSettingsRoute,
       quit: !isLoggedIn || isOnSettingsRoute,
     };
-  }, [isLoggedIn, isOnSettingsRoute, isLoadingState]);
+  }, [isLoggedIn, isOnSettingsRoute, isLoading]);
 
   const hotkeys: ShortcutHotkeys = {
     home: 'h',
diff --git a/src/renderer/routes/Notifications.tsx b/src/renderer/routes/Notifications.tsx
index dd4c6e70b..04aabcc1a 100644
--- a/src/renderer/routes/Notifications.tsx
+++ b/src/renderer/routes/Notifications.tsx
@@ -9,13 +9,8 @@ import { useAppContext } from '../context/App';
 import { getAccountUUID } from '../utils/auth/utils';
 
 export const NotificationsRoute: FC = () => {
-  const {
-    notifications,
-    isErrorState,
-    globalError,
-    settings,
-    hasNotifications,
-  } = useAppContext();
+  const { notifications, status, globalError, settings, hasNotifications } =
+    useAppContext();
 
   const hasMultipleAccounts = useMemo(
     () => notifications.length > 1,
@@ -27,7 +22,7 @@ export const NotificationsRoute: FC = () => {
     [notifications],
   );
 
-  if (isErrorState) {
+  if (status === 'error') {
     return <Oops error={globalError} />;
   }
 

From ffe3669cc47a27eb9c3ae5437761e25e6d546487 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Tue, 13 Jan 2026 10:19:53 -0500
Subject: [PATCH 09/17] feat: hotkeys

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/renderer/App.test.tsx                     | 184 -----------
 .../components/GlobalShortcuts.test.tsx       | 309 ++++++++++++++++++
 src/renderer/components/Sidebar.tsx           |   4 -
 .../components/settings/SettingsFooter.tsx    |   8 -
 src/renderer/hooks/useShortcutActions.ts      |   2 +-
 5 files changed, 310 insertions(+), 197 deletions(-)
 delete mode 100644 src/renderer/App.test.tsx
 create mode 100644 src/renderer/components/GlobalShortcuts.test.tsx

diff --git a/src/renderer/App.test.tsx b/src/renderer/App.test.tsx
deleted file mode 100644
index 0dc3885ff..000000000
--- a/src/renderer/App.test.tsx
+++ /dev/null
@@ -1,184 +0,0 @@
-import { render } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-
-import { mockSettings } from './__mocks__/state-mocks';
-import { App } from './App';
-import * as comms from './utils/comms';
-
-const navigateMock = jest.fn();
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-  useNavigate: () => navigateMock,
-}));
-
-// Provide a mutable mock context for useAppContext consumed by global shortcuts
-let mockContext: {
-  fetchNotifications: jest.Mock;
-  isLoggedIn: boolean;
-  status: 'success' | 'loading' | 'error';
-  settings: typeof mockSettings;
-  updateSetting: jest.Mock;
-  auth: { accounts: Array<{ hostname: string }> };
-  notifications: unknown[];
-} = {
-  fetchNotifications: jest.fn(),
-  isLoggedIn: true,
-  status: 'success',
-  settings: { ...mockSettings, participating: false },
-  updateSetting: jest.fn(),
-  auth: { accounts: [{ hostname: 'github.com' }] },
-  notifications: [],
-};
-jest.mock('./context/App', () => {
-  const actual = jest.requireActual('./context/App');
-  return {
-    ...actual,
-    useAppContext: () => mockContext,
-  };
-});
-
-describe('renderer/App.tsx global keyboard bindings', () => {
-  const fetchNotificationsMock = jest.fn();
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockContext = {
-      // minimal shape required by useGlobalShortcuts
-      fetchNotifications: fetchNotificationsMock,
-      isLoggedIn: true,
-      status: 'success',
-      settings: { ...mockSettings, participating: false },
-      updateSetting: jest.fn(),
-      auth: { accounts: [{ hostname: 'github.com' }] },
-      notifications: [],
-    };
-  });
-
-  it('should navigate home when pressing H key', async () => {
-    renderApp();
-    await userEvent.keyboard('h');
-    expect(navigateMock).toHaveBeenCalledTimes(1);
-    expect(navigateMock).toHaveBeenCalledWith('/', { replace: true });
-  });
-
-  it('should refresh notifications when pressing R key', async () => {
-    mockContext.status = 'success';
-    renderApp();
-    await userEvent.keyboard('r');
-    expect(navigateMock).toHaveBeenCalledWith('/', { replace: true });
-    expect(fetchNotificationsMock).toHaveBeenCalledTimes(1);
-  });
-
-  it('should not refresh notifications when pressing R key if status is loading', async () => {
-    mockContext.status = 'loading';
-    renderApp();
-    await userEvent.keyboard('r');
-    expect(fetchNotificationsMock).not.toHaveBeenCalled();
-  });
-
-  it('should toggle settings when pressing S key while logged in', async () => {
-    mockContext.isLoggedIn = true;
-    renderApp();
-    await userEvent.keyboard('s');
-    expect(navigateMock).toHaveBeenCalledTimes(1);
-    expect(navigateMock).toHaveBeenCalledWith('/settings');
-  });
-
-  it('should not toggle settings when pressing S key while logged out', async () => {
-    mockContext.isLoggedIn = false;
-    renderApp();
-    await userEvent.keyboard('s');
-    expect(navigateMock).not.toHaveBeenCalled();
-  });
-
-  it('should toggle filters when pressing F key while logged in', async () => {
-    mockContext.isLoggedIn = true;
-    renderApp();
-    await userEvent.keyboard('f');
-    expect(navigateMock).toHaveBeenCalledWith('/filters');
-  });
-
-  it('should not toggle filters when pressing F key while logged out', async () => {
-    mockContext.isLoggedIn = false;
-    renderApp();
-    await userEvent.keyboard('f');
-    expect(navigateMock).not.toHaveBeenCalled();
-  });
-
-  it('should ignore keyboard shortcuts when typing in an input', async () => {
-    renderApp();
-    const input = document.createElement('input');
-    document.body.appendChild(input);
-    input.focus();
-    navigateMock.mockClear();
-    await userEvent.keyboard('h');
-    expect(navigateMock).not.toHaveBeenCalled();
-    document.body.removeChild(input);
-  });
-
-  it('should ignore keyboard shortcuts when typing in a textarea', async () => {
-    renderApp();
-    const textarea = document.createElement('textarea');
-    document.body.appendChild(textarea);
-    textarea.focus();
-    navigateMock.mockClear();
-    await userEvent.keyboard('r');
-    expect(navigateMock).not.toHaveBeenCalled();
-    expect(fetchNotificationsMock).not.toHaveBeenCalled();
-    document.body.removeChild(textarea);
-  });
-
-  it('should ignore keyboard shortcuts when modifier keys are pressed', async () => {
-    mockContext.status = 'success';
-    renderApp();
-    const event = new KeyboardEvent('keydown', { key: 'h', metaKey: true });
-    navigateMock.mockClear();
-    document.dispatchEvent(event);
-    expect(navigateMock).not.toHaveBeenCalled();
-  });
-
-  it('should work with uppercase key press', async () => {
-    renderApp();
-    await userEvent.keyboard('H');
-    expect(navigateMock).toHaveBeenCalledWith('/', { replace: true });
-  });
-
-  it('should navigate to accounts when pressing A key while logged in', async () => {
-    mockContext.isLoggedIn = true;
-    renderApp('#/settings');
-    // Go to settings first; accounts shortcut only active on settings route
-    await userEvent.keyboard('s');
-    await userEvent.keyboard('a');
-    expect(navigateMock).toHaveBeenCalledWith('/accounts');
-  });
-
-  it('should quit the app when pressing Q key', async () => {
-    const quitAppSpy = jest.spyOn(comms, 'quitApp').mockImplementation();
-    renderApp('#/settings');
-    // Go to settings first; quit shortcut only active on settings route
-    await userEvent.keyboard('s');
-    await userEvent.keyboard('q');
-    expect(quitAppSpy).toHaveBeenCalledTimes(1);
-  });
-
-  it('should not trigger accounts when not on settings route', async () => {
-    mockContext.isLoggedIn = true;
-    renderApp('#/');
-    await userEvent.keyboard('a');
-    expect(navigateMock).not.toHaveBeenCalledWith('/accounts');
-  });
-
-  it('should not quit the app when not on settings route', async () => {
-    const quitAppSpy = jest.spyOn(comms, 'quitApp').mockImplementation();
-    renderApp('#/');
-    await userEvent.keyboard('q');
-    expect(quitAppSpy).not.toHaveBeenCalled();
-  });
-});
-
-function renderApp(initialHash?: string) {
-  if (initialHash) {
-    window.location.hash = initialHash;
-  }
-  return render(<App />);
-}
diff --git a/src/renderer/components/GlobalShortcuts.test.tsx b/src/renderer/components/GlobalShortcuts.test.tsx
new file mode 100644
index 000000000..7aa3c42ee
--- /dev/null
+++ b/src/renderer/components/GlobalShortcuts.test.tsx
@@ -0,0 +1,309 @@
+import userEvent from '@testing-library/user-event';
+import { MemoryRouter } from 'react-router-dom';
+
+import { renderWithAppContext } from '../__helpers__/test-utils';
+import * as comms from '../utils/comms';
+import { GlobalShortcuts } from './GlobalShortcuts';
+
+const navigateMock = jest.fn();
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: () => navigateMock,
+}));
+
+describe('components/GlobalShortcuts.tsx', () => {
+  const fetchNotificationsMock = jest.fn();
+  const updateSettingMock = jest.fn();
+  const quitAppSpy = jest.spyOn(comms, 'quitApp').mockImplementation();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('key bindings', () => {
+    describe('home', () => {
+      it('navigates home when pressing H key', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+        );
+
+        await userEvent.keyboard('h');
+
+        expect(navigateMock).toHaveBeenCalledWith('/', { replace: true });
+      });
+    });
+
+    describe('focus mode', () => {
+      it('toggles focus when pressing W while logged in', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+          {
+            updateSetting: updateSettingMock,
+            isLoggedIn: true,
+          },
+        );
+
+        await userEvent.keyboard('w');
+
+        expect(updateSettingMock).toHaveBeenCalledWith('participating', true);
+      });
+
+      it('does not toggle focus mode when loading', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+          {
+            updateSetting: updateSettingMock,
+            status: 'loading',
+            isLoggedIn: true,
+          },
+        );
+
+        await userEvent.keyboard('w');
+
+        expect(updateSettingMock).not.toHaveBeenCalled();
+      });
+
+      it('does not toggle focus mode when logged out', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+          {
+            updateSetting: updateSettingMock,
+            isLoggedIn: false,
+          },
+        );
+
+        await userEvent.keyboard('w');
+
+        expect(updateSettingMock).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('filters', () => {
+      it('toggles filters when pressing F while logged in', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+          {
+            isLoggedIn: true,
+          },
+        );
+
+        await userEvent.keyboard('f');
+
+        expect(navigateMock).toHaveBeenCalledWith('/filters');
+      });
+
+      it('does not toggle filters when logged out', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+          {
+            isLoggedIn: false,
+          },
+        );
+
+        await userEvent.keyboard('f');
+
+        expect(navigateMock).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('refresh', () => {
+      it('refreshes notifications when pressing R key', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+          {
+            fetchNotifications: fetchNotificationsMock,
+          },
+        );
+
+        await userEvent.keyboard('r');
+
+        expect(navigateMock).toHaveBeenCalledWith('/', { replace: true });
+        expect(fetchNotificationsMock).toHaveBeenCalledTimes(1);
+      });
+
+      it('does not refresh when status is loading', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+          {
+            status: 'loading',
+          },
+        );
+
+        await userEvent.keyboard('r');
+
+        expect(fetchNotificationsMock).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('settings', () => {
+      it('toggles settings when pressing S while logged in', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+          {
+            isLoggedIn: true,
+          },
+        );
+
+        await userEvent.keyboard('s');
+
+        expect(navigateMock).toHaveBeenCalledWith('/settings');
+      });
+
+      it('does not toggle settings when logged out', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+          {
+            isLoggedIn: false,
+          },
+        );
+
+        await userEvent.keyboard('s');
+
+        expect(navigateMock).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('accounts', () => {
+      it('navigates to accounts when pressing A on settings route', async () => {
+        renderWithAppContext(
+          <MemoryRouter initialEntries={['/settings']}>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+          {
+            isLoggedIn: true,
+          },
+        );
+
+        await userEvent.keyboard('a');
+
+        expect(navigateMock).toHaveBeenCalledWith('/accounts');
+      });
+
+      it('does not trigger accounts when not on settings route', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+          {
+            isLoggedIn: true,
+          },
+        );
+
+        await userEvent.keyboard('a');
+
+        expect(navigateMock).not.toHaveBeenCalledWith('/accounts');
+      });
+    });
+
+    describe('quit app', () => {
+      it('quits the app when pressing Q on settings route', async () => {
+        renderWithAppContext(
+          <MemoryRouter initialEntries={['/settings']}>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+          {
+            isLoggedIn: true,
+          },
+        );
+
+        await userEvent.keyboard('q');
+
+        expect(quitAppSpy).toHaveBeenCalledTimes(1);
+      });
+
+      it('does not quit the app when not on settings route', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+          {
+            isLoggedIn: true,
+          },
+        );
+
+        await userEvent.keyboard('q');
+
+        expect(quitAppSpy).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('modifiers', () => {
+      it('ignores shortcuts when typing in an input', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+            <input id="test-input" />
+          </MemoryRouter>,
+          {
+            isLoggedIn: true,
+          },
+        );
+
+        const input = document.getElementById(
+          'test-input',
+        ) as HTMLTextAreaElement;
+        input.focus();
+        await userEvent.type(input, 'h');
+
+        expect(navigateMock).not.toHaveBeenCalled();
+      });
+
+      it('ignores shortcuts when typing in a textarea', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+            <textarea id="test-textarea" />
+          </MemoryRouter>,
+          {
+            isLoggedIn: true,
+          },
+        );
+
+        const textarea = document.getElementById(
+          'test-textarea',
+        ) as HTMLTextAreaElement;
+        textarea.focus();
+        await userEvent.type(textarea, 'h');
+
+        expect(navigateMock).not.toHaveBeenCalled();
+      });
+
+      it('ignores shortcuts when modifier keys are pressed', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+          {
+            isLoggedIn: true,
+          },
+        );
+
+        const event = new KeyboardEvent('keydown', { key: 'h', metaKey: true });
+        navigateMock.mockClear();
+        document.dispatchEvent(event);
+
+        expect(navigateMock).not.toHaveBeenCalled();
+      });
+    });
+  });
+});
diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx
index b90c222e8..af5ce9485 100644
--- a/src/renderer/components/Sidebar.tsx
+++ b/src/renderer/components/Sidebar.tsx
@@ -1,9 +1,5 @@
 import type { FC } from 'react';
 
-// import { useLocation, useNavigate } from 'react-router-dom';
-
-// import { useLocation, useNavigate } from 'react-router-dom';
-
 import {
   BellIcon,
   CrosshairsIcon,
diff --git a/src/renderer/components/settings/SettingsFooter.tsx b/src/renderer/components/settings/SettingsFooter.tsx
index 2c4b0c3c4..fcee71440 100644
--- a/src/renderer/components/settings/SettingsFooter.tsx
+++ b/src/renderer/components/settings/SettingsFooter.tsx
@@ -1,15 +1,10 @@
 import { type FC, useEffect, useState } from 'react';
 
-// import { useLocation, useNavigate } from 'react-router-dom';
-
-// import { useLocation, useNavigate } from 'react-router-dom';
-
 import { PersonIcon, XCircleIcon } from '@primer/octicons-react';
 import { Button, IconButton, Stack, Tooltip } from '@primer/react';
 
 import { APPLICATION } from '../../../shared/constants';
 
-import { useAppContext } from '../../context/App';
 import { useShortcutActions } from '../../hooks/useShortcutActions';
 import { getAppVersion } from '../../utils/comms';
 import { openGitifyReleaseNotes } from '../../utils/links';
@@ -17,9 +12,6 @@ import { Footer } from '../primitives/Footer';
 
 export const SettingsFooter: FC = () => {
   const [appVersion, setAppVersion] = useState<string | null>(null);
-  // const navigate = useNavigate();
-  // const location = useLocation();
-  useAppContext();
   const { actions, hotkeys } = useShortcutActions();
 
   useEffect(() => {
diff --git a/src/renderer/hooks/useShortcutActions.ts b/src/renderer/hooks/useShortcutActions.ts
index 23b42c1df..5806f4c89 100644
--- a/src/renderer/hooks/useShortcutActions.ts
+++ b/src/renderer/hooks/useShortcutActions.ts
@@ -77,7 +77,7 @@ export function useShortcutActions(): {
   const enabled: ShortcutEnabled = useMemo(() => {
     return {
       home: true,
-      focusedMode: !isLoading,
+      focusedMode: isLoggedIn && !isLoading,
       filters: isLoggedIn,
       refresh: !isLoading,
       settings: isLoggedIn,

From 1354bdfed7fc3f9440373afdf72c74548852831c Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Tue, 13 Jan 2026 10:37:14 -0500
Subject: [PATCH 10/17] feat: hotkeys

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/renderer/components/GlobalShortcuts.tsx   |  22 ++--
 src/renderer/components/Sidebar.tsx           |  29 +++--
 .../components/settings/SettingsFooter.tsx    |  10 +-
 src/renderer/hooks/useShortcutActions.ts      | 118 +++++++++---------
 4 files changed, 92 insertions(+), 87 deletions(-)

diff --git a/src/renderer/components/GlobalShortcuts.tsx b/src/renderer/components/GlobalShortcuts.tsx
index 8789cb4a9..1bb5af73b 100644
--- a/src/renderer/components/GlobalShortcuts.tsx
+++ b/src/renderer/components/GlobalShortcuts.tsx
@@ -7,15 +7,15 @@ import { useShortcutActions } from '../hooks/useShortcutActions';
  * Mount once inside App, within Router + AppProvider.
  */
 export const GlobalShortcuts: FC = () => {
-  const { actions, enabled, hotkeys } = useShortcutActions();
+  const { shortcuts } = useShortcutActions();
 
   useEffect(() => {
-    const keyToName = Object.entries(hotkeys).reduce<
-      Record<string, keyof typeof actions>
-    >((acc, [name, key]) => {
-      acc[key] = name as keyof typeof actions;
-      return acc;
-    }, {});
+    const keyToName = new Map<string, keyof typeof shortcuts>(
+      Object.entries(shortcuts).map(([name, cfg]) => [
+        cfg.key,
+        name as keyof typeof shortcuts,
+      ]),
+    );
 
     const handler = (event: KeyboardEvent) => {
       // Ignore if user is typing in an input, textarea, or with modifiers
@@ -30,14 +30,14 @@ export const GlobalShortcuts: FC = () => {
       }
 
       const key = event.key.toLowerCase();
-      const name = keyToName[key];
+      const name = keyToName.get(key);
       if (!name) {
         return;
       }
 
-      if (enabled[name]) {
+      if (shortcuts[name].enabled) {
         event.preventDefault();
-        actions[name]();
+        shortcuts[name].action();
       }
     };
 
@@ -45,7 +45,7 @@ export const GlobalShortcuts: FC = () => {
     return () => {
       document.removeEventListener('keydown', handler);
     };
-  }, [actions, enabled, hotkeys]);
+  }, [shortcuts]);
 
   return null;
 };
diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx
index af5ce9485..5d116839c 100644
--- a/src/renderer/components/Sidebar.tsx
+++ b/src/renderer/components/Sidebar.tsx
@@ -18,7 +18,6 @@ import { APPLICATION } from '../../shared/constants';
 import { useAppContext } from '../context/App';
 import { useShortcutActions } from '../hooks/useShortcutActions';
 import { getPrimaryAccountHostname } from '../utils/auth/utils';
-import { quitApp } from '../utils/comms';
 import {
   openGitHubIssues,
   openGitHubNotifications,
@@ -39,7 +38,7 @@ export const Sidebar: FC = () => {
 
   const primaryAccountHostname = getPrimaryAccountHostname(auth);
 
-  const { actions, hotkeys, enabled } = useShortcutActions();
+  const { shortcuts } = useShortcutActions();
 
   return (
     <Stack
@@ -58,8 +57,8 @@ export const Sidebar: FC = () => {
           data-testid="sidebar-home"
           description="Home"
           icon={LogoIcon}
-          keybindingHint={hotkeys.home}
-          onClick={() => actions.home()}
+          keybindingHint={shortcuts.home.key}
+          onClick={() => shortcuts.home.action()}
           size="small"
           tooltipDirection="e"
           variant="invisible"
@@ -87,8 +86,8 @@ export const Sidebar: FC = () => {
                   : 'Participating and watching'
               }
               icon={settings.participating ? CrosshairsIcon : EyeIcon}
-              keybindingHint={hotkeys.focusedMode}
-              onClick={() => actions.focusedMode()}
+              keybindingHint={shortcuts.focusedMode.key}
+              onClick={() => shortcuts.focusedMode.action()}
               size="small"
               tooltipDirection="e"
               variant={settings.participating ? 'primary' : 'invisible'}
@@ -99,8 +98,8 @@ export const Sidebar: FC = () => {
               data-testid="sidebar-filter-notifications"
               description="Filter notifications"
               icon={FilterIcon}
-              keybindingHint={hotkeys.filters}
-              onClick={() => actions.filters()}
+              keybindingHint={shortcuts.filters.key}
+              onClick={() => shortcuts.filters.action()}
               size="small"
               tooltipDirection="e"
               variant={hasActiveFilters(settings) ? 'primary' : 'invisible'}
@@ -142,11 +141,11 @@ export const Sidebar: FC = () => {
               className={status === 'loading' ? 'animate-spin' : ''}
               data-testid="sidebar-refresh"
               description="Refresh notifications"
-              disabled={!enabled.refresh}
+              disabled={!shortcuts.refresh.enabled}
               icon={SyncIcon}
-              keybindingHint={hotkeys.refresh}
+              keybindingHint={shortcuts.refresh.key}
               // loading={status === 'loading'}
-              onClick={() => actions.refresh()}
+              onClick={() => shortcuts.refresh.action()}
               size="small"
               tooltipDirection="e"
               variant="invisible"
@@ -157,8 +156,8 @@ export const Sidebar: FC = () => {
               data-testid="sidebar-settings"
               description="Settings"
               icon={GearIcon}
-              keybindingHint={hotkeys.settings}
-              onClick={() => actions.settings()}
+              keybindingHint={shortcuts.settings.key}
+              onClick={() => shortcuts.settings.action()}
               size="small"
               tooltipDirection="e"
               variant="invisible"
@@ -171,8 +170,8 @@ export const Sidebar: FC = () => {
             aria-label={`Quit ${APPLICATION.NAME}`}
             data-testid="sidebar-quit"
             icon={XCircleIcon}
-            keybindingHint={hotkeys.quit}
-            onClick={() => quitApp()}
+            keybindingHint={shortcuts.quit.key}
+            onClick={() => shortcuts.quit.action()}
             size="small"
             tooltipDirection="e"
             variant="invisible"
diff --git a/src/renderer/components/settings/SettingsFooter.tsx b/src/renderer/components/settings/SettingsFooter.tsx
index fcee71440..706df3040 100644
--- a/src/renderer/components/settings/SettingsFooter.tsx
+++ b/src/renderer/components/settings/SettingsFooter.tsx
@@ -12,7 +12,7 @@ import { Footer } from '../primitives/Footer';
 
 export const SettingsFooter: FC = () => {
   const [appVersion, setAppVersion] = useState<string | null>(null);
-  const { actions, hotkeys } = useShortcutActions();
+  const { shortcuts } = useShortcutActions();
 
   useEffect(() => {
     (async () => {
@@ -39,9 +39,9 @@ export const SettingsFooter: FC = () => {
           data-testid="settings-accounts"
           description="Accounts"
           icon={PersonIcon}
-          keybindingHint={hotkeys.accounts}
+          keybindingHint={shortcuts.accounts.key}
           onClick={() => {
-            actions.accounts();
+            shortcuts.accounts.action();
           }}
           tooltipDirection="n"
         />
@@ -51,9 +51,9 @@ export const SettingsFooter: FC = () => {
           data-testid="settings-quit"
           description={`Quit ${APPLICATION.NAME}`}
           icon={XCircleIcon}
-          keybindingHint={hotkeys.quit}
+          keybindingHint={shortcuts.quit.key}
           onClick={() => {
-            actions.quit();
+            shortcuts.quit.action();
           }}
           tooltipDirection="nw"
           variant="danger"
diff --git a/src/renderer/hooks/useShortcutActions.ts b/src/renderer/hooks/useShortcutActions.ts
index 5806f4c89..e78656ab4 100644
--- a/src/renderer/hooks/useShortcutActions.ts
+++ b/src/renderer/hooks/useShortcutActions.ts
@@ -4,7 +4,7 @@ import { useLocation, useNavigate } from 'react-router-dom';
 import { useAppContext } from '../context/App';
 import { quitApp } from '../utils/comms';
 
-export type ShortcutName =
+type ShortcutName =
   | 'home'
   | 'refresh'
   | 'settings'
@@ -13,19 +13,19 @@ export type ShortcutName =
   | 'quit'
   | 'accounts';
 
-type ShortcutActions = Record<ShortcutName, () => void>;
-type ShortcutEnabled = Record<ShortcutName, boolean>;
-type ShortcutHotkeys = Record<ShortcutName, string>;
+type ShortcutConfig = {
+  key: string;
+  enabled: boolean;
+  action: () => void;
+};
+
+type ShortcutConfigs = Record<ShortcutName, ShortcutConfig>;
 
 /**
  * Centralized shortcut actions + enabled state + hotkeys.
  * Used by both the global shortcuts component and UI buttons to avoid duplication.
  */
-export function useShortcutActions(): {
-  actions: ShortcutActions;
-  enabled: ShortcutEnabled;
-  hotkeys: ShortcutHotkeys;
-} {
+export function useShortcutActions(): { shortcuts: ShortcutConfigs } {
   const navigate = useNavigate();
   const location = useLocation();
   const { fetchNotifications, isLoggedIn, status, settings, updateSetting } =
@@ -35,66 +35,72 @@ export function useShortcutActions(): {
   const isOnSettingsRoute = location.pathname.startsWith('/settings');
   const isLoading = status === 'loading';
 
-  const actions: ShortcutActions = useMemo(() => {
+  const shortcuts: ShortcutConfigs = useMemo(() => {
     return {
-      home: () => navigate('/', { replace: true }),
-      focusedMode: () =>
-        updateSetting('participating', !settings.participating),
-      filters: () => {
-        if (isOnFiltersRoute) {
-          navigate('/', { replace: true });
-        } else {
-          navigate('/filters');
-        }
+      home: {
+        key: 'h',
+        enabled: true,
+        action: () => navigate('/', { replace: true }),
+      },
+      focusedMode: {
+        key: 'w',
+        enabled: isLoggedIn && !isLoading,
+        action: () => updateSetting('participating', !settings.participating),
       },
-      refresh: () => {
-        if (isLoading) {
-          return;
-        }
-        navigate('/', { replace: true });
-        void fetchNotifications();
+      filters: {
+        key: 'f',
+        enabled: isLoggedIn,
+        action: () => {
+          if (isOnFiltersRoute) {
+            navigate('/', { replace: true });
+          } else {
+            navigate('/filters');
+          }
+        },
       },
-      settings: () => {
-        if (isOnSettingsRoute) {
+      refresh: {
+        key: 'r',
+        enabled: !isLoading,
+        action: () => {
+          if (isLoading) {
+            return;
+          }
           navigate('/', { replace: true });
           void fetchNotifications();
-        } else {
-          navigate('/settings');
-        }
+        },
+      },
+      settings: {
+        key: 's',
+        enabled: isLoggedIn,
+        action: () => {
+          if (isOnSettingsRoute) {
+            navigate('/', { replace: true });
+            void fetchNotifications();
+          } else {
+            navigate('/settings');
+          }
+        },
+      },
+      accounts: {
+        key: 'a',
+        enabled: isLoggedIn && isOnSettingsRoute,
+        action: () => navigate('/accounts'),
+      },
+      quit: {
+        key: 'q',
+        enabled: !isLoggedIn || isOnSettingsRoute,
+        action: () => quitApp(),
       },
-      accounts: () => navigate('/accounts'),
-      quit: () => quitApp(),
     };
   }, [
     settings.participating,
+    isLoggedIn,
     isLoading,
-    isOnSettingsRoute,
     isOnFiltersRoute,
+    isOnSettingsRoute,
     fetchNotifications,
     updateSetting,
   ]);
 
-  const enabled: ShortcutEnabled = useMemo(() => {
-    return {
-      home: true,
-      focusedMode: isLoggedIn && !isLoading,
-      filters: isLoggedIn,
-      refresh: !isLoading,
-      settings: isLoggedIn,
-      accounts: isLoggedIn && isOnSettingsRoute,
-      quit: !isLoggedIn || isOnSettingsRoute,
-    };
-  }, [isLoggedIn, isOnSettingsRoute, isLoading]);
-
-  const hotkeys: ShortcutHotkeys = {
-    home: 'h',
-    focusedMode: 'w',
-    filters: 'f',
-    refresh: 'r',
-    settings: 's',
-    accounts: 'a',
-    quit: 'q',
-  };
-
-  return { actions, enabled, hotkeys };
+  return { shortcuts };
 }

From 04cd5a0006fe9cab46b256a54349144a71ed5013 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Thu, 15 Jan 2026 14:51:15 -0500
Subject: [PATCH 11/17] feat: hotkeys

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/renderer/App.tsx                          |  9 ++--
 src/renderer/components/AllRead.tsx           |  2 +-
 src/renderer/components/GlobalShortcuts.tsx   |  2 +-
 src/renderer/components/Sidebar.tsx           |  6 ++-
 .../components/filters/FilterSection.tsx      |  2 +-
 .../components/filters/SearchFilter.tsx       |  2 +-
 .../filters/SearchFilterSuggestions.tsx       |  2 +-
 .../components/metrics/MetricGroup.tsx        |  2 +-
 .../notifications/AccountNotifications.tsx    |  2 +-
 .../notifications/NotificationHeader.tsx      |  2 +-
 .../notifications/NotificationRow.tsx         |  3 +-
 .../notifications/RepositoryNotifications.tsx |  3 +-
 src/renderer/components/primitives/Header.tsx |  2 +-
 .../settings/AppearanceSettings.tsx           |  3 +-
 .../settings/NotificationSettings.tsx         |  3 +-
 .../components/settings/SettingsReset.tsx     |  2 +-
 .../components/settings/SystemSettings.tsx    |  2 +-
 .../components/settings/TraySettings.tsx      |  2 +-
 src/renderer/context/App.test.tsx             |  7 +--
 src/renderer/context/App.tsx                  | 13 -----
 src/renderer/hooks/useAppContext.ts           | 15 ++++++
 src/renderer/hooks/useShortcutActions.ts      | 22 +++++----
 src/renderer/routes/Accounts.tsx              |  5 +-
 src/renderer/routes/Filters.tsx               |  2 +-
 src/renderer/routes/Login.tsx                 |  3 +-
 src/renderer/routes/LoginWithOAuthApp.tsx     |  2 +-
 .../routes/LoginWithPersonalAccessToken.tsx   |  2 +-
 src/renderer/routes/Notifications.tsx         |  2 +-
 .../utils/api/graphql/generated/graphql.ts    | 47 ++-----------------
 29 files changed, 75 insertions(+), 96 deletions(-)
 create mode 100644 src/renderer/hooks/useAppContext.ts

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index 086e59b9e..4012c3fdb 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -10,7 +10,7 @@ import { BaseStyles, ThemeProvider } from '@primer/react';
 
 import { GlobalShortcuts } from './components/GlobalShortcuts';
 import { AppLayout } from './components/layout/AppLayout';
-import { AppProvider, useAppContext } from './context/App';
+import { AppProvider } from './context/App';
 import { AccountsRoute } from './routes/Accounts';
 import { FiltersRoute } from './routes/Filters';
 import { LoginRoute } from './routes/Login';
@@ -21,10 +21,13 @@ import { SettingsRoute } from './routes/Settings';
 
 import './App.css';
 
+import { useAppContext } from './hooks/useAppContext';
+
 function RequireAuth({ children }) {
-  const { isLoggedIn } = useAppContext();
   const location = useLocation();
 
+  const { isLoggedIn } = useAppContext();
+
   return isLoggedIn ? (
     children
   ) : (
@@ -37,8 +40,8 @@ export const App = () => {
     <ThemeProvider>
       <BaseStyles>
         <AppProvider>
+          <GlobalShortcuts />
           <Router>
-            <GlobalShortcuts />
             <AppLayout>
               <Routes>
                 <Route
diff --git a/src/renderer/components/AllRead.tsx b/src/renderer/components/AllRead.tsx
index 95e0de99d..aa781a07c 100644
--- a/src/renderer/components/AllRead.tsx
+++ b/src/renderer/components/AllRead.tsx
@@ -1,7 +1,7 @@
 import { type FC, useMemo } from 'react';
 
 import { Constants } from '../constants';
-import { useAppContext } from '../context/App';
+import { useAppContext } from '../hooks/useAppContext';
 import { hasActiveFilters } from '../utils/notifications/filters/filter';
 import { EmojiSplash } from './layout/EmojiSplash';
 
diff --git a/src/renderer/components/GlobalShortcuts.tsx b/src/renderer/components/GlobalShortcuts.tsx
index 1bb5af73b..e678878b5 100644
--- a/src/renderer/components/GlobalShortcuts.tsx
+++ b/src/renderer/components/GlobalShortcuts.tsx
@@ -35,7 +35,7 @@ export const GlobalShortcuts: FC = () => {
         return;
       }
 
-      if (shortcuts[name].enabled) {
+      if (shortcuts[name].isAllowed) {
         event.preventDefault();
         shortcuts[name].action();
       }
diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx
index 5d116839c..3721954d4 100644
--- a/src/renderer/components/Sidebar.tsx
+++ b/src/renderer/components/Sidebar.tsx
@@ -15,7 +15,7 @@ import { IconButton, Stack } from '@primer/react';
 
 import { APPLICATION } from '../../shared/constants';
 
-import { useAppContext } from '../context/App';
+import { useAppContext } from '../hooks/useAppContext';
 import { useShortcutActions } from '../hooks/useShortcutActions';
 import { getPrimaryAccountHostname } from '../utils/auth/utils';
 import {
@@ -40,6 +40,8 @@ export const Sidebar: FC = () => {
 
   const { shortcuts } = useShortcutActions();
 
+  const isLoading = status === 'loading';
+
   return (
     <Stack
       className="fixed w-sidebar h-full bg-gitify-sidebar [&_svg]:text-white"
@@ -141,7 +143,7 @@ export const Sidebar: FC = () => {
               className={status === 'loading' ? 'animate-spin' : ''}
               data-testid="sidebar-refresh"
               description="Refresh notifications"
-              disabled={!shortcuts.refresh.enabled}
+              disabled={!isLoading}
               icon={SyncIcon}
               keybindingHint={shortcuts.refresh.key}
               // loading={status === 'loading'}
diff --git a/src/renderer/components/filters/FilterSection.tsx b/src/renderer/components/filters/FilterSection.tsx
index dbf7c0d84..47d7c424d 100644
--- a/src/renderer/components/filters/FilterSection.tsx
+++ b/src/renderer/components/filters/FilterSection.tsx
@@ -3,7 +3,7 @@ import type { ReactNode } from 'react';
 import type { Icon } from '@primer/octicons-react';
 import { Stack, Text } from '@primer/react';
 
-import { useAppContext } from '../../context/App';
+import { useAppContext } from '../../hooks/useAppContext';
 import type { FilterSettingsState, FilterSettingsValue } from '../../types';
 import type { Filter } from '../../utils/notifications/filters';
 import { Checkbox } from '../fields/Checkbox';
diff --git a/src/renderer/components/filters/SearchFilter.tsx b/src/renderer/components/filters/SearchFilter.tsx
index b5999349d..f4b918a46 100644
--- a/src/renderer/components/filters/SearchFilter.tsx
+++ b/src/renderer/components/filters/SearchFilter.tsx
@@ -10,7 +10,7 @@ import {
 } from '@primer/octicons-react';
 import { Stack, Text } from '@primer/react';
 
-import { useAppContext } from '../../context/App';
+import { useAppContext } from '../../hooks/useAppContext';
 import { IconColor, type SearchToken, Size } from '../../types';
 import { cn } from '../../utils/cn';
 import {
diff --git a/src/renderer/components/filters/SearchFilterSuggestions.tsx b/src/renderer/components/filters/SearchFilterSuggestions.tsx
index 5a94dcaf0..d02d3272d 100644
--- a/src/renderer/components/filters/SearchFilterSuggestions.tsx
+++ b/src/renderer/components/filters/SearchFilterSuggestions.tsx
@@ -2,7 +2,7 @@ import type { FC } from 'react';
 
 import { Popover, Stack, Text } from '@primer/react';
 
-import { useAppContext } from '../../context/App';
+import { useAppContext } from '../../hooks/useAppContext';
 import { Opacity } from '../../types';
 import { cn } from '../../utils/cn';
 import {
diff --git a/src/renderer/components/metrics/MetricGroup.tsx b/src/renderer/components/metrics/MetricGroup.tsx
index 028362185..31317ad7f 100644
--- a/src/renderer/components/metrics/MetricGroup.tsx
+++ b/src/renderer/components/metrics/MetricGroup.tsx
@@ -7,7 +7,7 @@ import {
   TagIcon,
 } from '@primer/octicons-react';
 
-import { useAppContext } from '../../context/App';
+import { useAppContext } from '../../hooks/useAppContext';
 import { type GitifyNotification, IconColor } from '../../types';
 import { getPullRequestReviewIcon } from '../../utils/icons';
 import { MetricPill } from './MetricPill';
diff --git a/src/renderer/components/notifications/AccountNotifications.tsx b/src/renderer/components/notifications/AccountNotifications.tsx
index 12f427f93..94ea0a452 100644
--- a/src/renderer/components/notifications/AccountNotifications.tsx
+++ b/src/renderer/components/notifications/AccountNotifications.tsx
@@ -3,7 +3,7 @@ import { type FC, type MouseEvent, useMemo, useState } from 'react';
 import { GitPullRequestIcon, IssueOpenedIcon } from '@primer/octicons-react';
 import { Button, Stack } from '@primer/react';
 
-import { useAppContext } from '../../context/App';
+import { useAppContext } from '../../hooks/useAppContext';
 import {
   type Account,
   type GitifyError,
diff --git a/src/renderer/components/notifications/NotificationHeader.tsx b/src/renderer/components/notifications/NotificationHeader.tsx
index 3b950a987..6ac837fd7 100644
--- a/src/renderer/components/notifications/NotificationHeader.tsx
+++ b/src/renderer/components/notifications/NotificationHeader.tsx
@@ -2,7 +2,7 @@ import type { FC, MouseEvent } from 'react';
 
 import { Stack } from '@primer/react';
 
-import { useAppContext } from '../../context/App';
+import { useAppContext } from '../../hooks/useAppContext';
 import { type GitifyNotification, Opacity, Size } from '../../types';
 import { cn } from '../../utils/cn';
 import { openRepository } from '../../utils/links';
diff --git a/src/renderer/components/notifications/NotificationRow.tsx b/src/renderer/components/notifications/NotificationRow.tsx
index 54da4bfdd..2e9c0041e 100644
--- a/src/renderer/components/notifications/NotificationRow.tsx
+++ b/src/renderer/components/notifications/NotificationRow.tsx
@@ -3,7 +3,7 @@ import { type FC, useCallback, useState } from 'react';
 import { BellSlashIcon, CheckIcon, ReadIcon } from '@primer/octicons-react';
 import { Stack, Text, Tooltip } from '@primer/react';
 
-import { useAppContext } from '../../context/App';
+import { useAppContext } from '../../hooks/useAppContext';
 import { type GitifyNotification, Opacity, Size } from '../../types';
 import { cn } from '../../utils/cn';
 import { isMarkAsDoneFeatureSupported } from '../../utils/features';
@@ -30,6 +30,7 @@ export const NotificationRow: FC<NotificationRowProps> = ({
     markNotificationsAsDone,
     unsubscribeNotification,
   } = useAppContext();
+
   const [animateExit, setAnimateExit] = useState(false);
 
   const shouldAnimateExit = shouldRemoveNotificationsFromState(settings);
diff --git a/src/renderer/components/notifications/RepositoryNotifications.tsx b/src/renderer/components/notifications/RepositoryNotifications.tsx
index 7a9ef26e6..dfcd3a14a 100644
--- a/src/renderer/components/notifications/RepositoryNotifications.tsx
+++ b/src/renderer/components/notifications/RepositoryNotifications.tsx
@@ -3,7 +3,7 @@ import { type FC, type MouseEvent, useState } from 'react';
 import { CheckIcon, ReadIcon } from '@primer/octicons-react';
 import { Button, Stack } from '@primer/react';
 
-import { useAppContext } from '../../context/App';
+import { useAppContext } from '../../hooks/useAppContext';
 import { type GitifyNotification, Opacity, Size } from '../../types';
 import { cn } from '../../utils/cn';
 import { isMarkAsDoneFeatureSupported } from '../../utils/features';
@@ -26,6 +26,7 @@ export const RepositoryNotifications: FC<RepositoryNotificationsProps> = ({
 }) => {
   const { settings, markNotificationsAsRead, markNotificationsAsDone } =
     useAppContext();
+
   const [animateExit, setAnimateExit] = useState(false);
   const [showRepositoryNotifications, setShowRepositoryNotifications] =
     useState(true);
diff --git a/src/renderer/components/primitives/Header.tsx b/src/renderer/components/primitives/Header.tsx
index 80536dcc1..4d0e19115 100644
--- a/src/renderer/components/primitives/Header.tsx
+++ b/src/renderer/components/primitives/Header.tsx
@@ -4,7 +4,7 @@ import { useNavigate } from 'react-router-dom';
 import { ArrowLeftIcon, type Icon } from '@primer/octicons-react';
 import { IconButton, Stack } from '@primer/react';
 
-import { useAppContext } from '../../context/App';
+import { useAppContext } from '../../hooks/useAppContext';
 import { Title } from './Title';
 
 interface HeaderProps {
diff --git a/src/renderer/components/settings/AppearanceSettings.tsx b/src/renderer/components/settings/AppearanceSettings.tsx
index 0c904e56a..93f254aee 100644
--- a/src/renderer/components/settings/AppearanceSettings.tsx
+++ b/src/renderer/components/settings/AppearanceSettings.tsx
@@ -15,7 +15,7 @@ import {
   Text,
 } from '@primer/react';
 
-import { useAppContext } from '../../context/App';
+import { useAppContext } from '../../hooks/useAppContext';
 import { Theme } from '../../types';
 import { hasMultipleAccounts } from '../../utils/auth/utils';
 import {
@@ -32,6 +32,7 @@ import { Title } from '../primitives/Title';
 
 export const AppearanceSettings: FC = () => {
   const { auth, settings, updateSetting } = useAppContext();
+
   const zoomPercentage = zoomLevelToPercentage(window.gitify.zoom.getLevel());
 
   return (
diff --git a/src/renderer/components/settings/NotificationSettings.tsx b/src/renderer/components/settings/NotificationSettings.tsx
index 1507ea1cd..95126c50b 100644
--- a/src/renderer/components/settings/NotificationSettings.tsx
+++ b/src/renderer/components/settings/NotificationSettings.tsx
@@ -19,7 +19,7 @@ import { formatDuration, millisecondsToMinutes } from 'date-fns';
 import { APPLICATION } from '../../../shared/constants';
 
 import { Constants } from '../../constants';
-import { useAppContext } from '../../context/App';
+import { useAppContext } from '../../hooks/useAppContext';
 import { FetchType, GroupBy, Size } from '../../types';
 import { openGitHubParticipatingDocs } from '../../utils/links';
 import { Checkbox } from '../fields/Checkbox';
@@ -29,6 +29,7 @@ import { Title } from '../primitives/Title';
 
 export const NotificationSettings: FC = () => {
   const { settings, updateSetting } = useAppContext();
+
   const [fetchInterval, setFetchInterval] = useState<number>(
     settings.fetchInterval,
   );
diff --git a/src/renderer/components/settings/SettingsReset.tsx b/src/renderer/components/settings/SettingsReset.tsx
index ead10082b..09dd8a41e 100644
--- a/src/renderer/components/settings/SettingsReset.tsx
+++ b/src/renderer/components/settings/SettingsReset.tsx
@@ -2,7 +2,7 @@ import type { FC } from 'react';
 
 import { Button, Stack, useConfirm } from '@primer/react';
 
-import { useAppContext } from '../../context/App';
+import { useAppContext } from '../../hooks/useAppContext';
 import { rendererLogInfo } from '../../utils/logger';
 
 export const SettingsReset: FC = () => {
diff --git a/src/renderer/components/settings/SystemSettings.tsx b/src/renderer/components/settings/SystemSettings.tsx
index c87d4aacb..dd83c3908 100644
--- a/src/renderer/components/settings/SystemSettings.tsx
+++ b/src/renderer/components/settings/SystemSettings.tsx
@@ -5,8 +5,8 @@ import { Button, ButtonGroup, IconButton, Stack, Text } from '@primer/react';
 
 import { APPLICATION } from '../../../shared/constants';
 
-import { useAppContext } from '../../context/App';
 import { defaultSettings } from '../../context/defaults';
+import { useAppContext } from '../../hooks/useAppContext';
 import { OpenPreference } from '../../types';
 import {
   canDecreaseVolume,
diff --git a/src/renderer/components/settings/TraySettings.tsx b/src/renderer/components/settings/TraySettings.tsx
index 2866411e6..7e0e40a1c 100644
--- a/src/renderer/components/settings/TraySettings.tsx
+++ b/src/renderer/components/settings/TraySettings.tsx
@@ -5,7 +5,7 @@ import { Stack, Text } from '@primer/react';
 
 import { APPLICATION } from '../../../shared/constants';
 
-import { useAppContext } from '../../context/App';
+import { useAppContext } from '../../hooks/useAppContext';
 import { Checkbox } from '../fields/Checkbox';
 import { Title } from '../primitives/Title';
 
diff --git a/src/renderer/context/App.test.tsx b/src/renderer/context/App.test.tsx
index f0ba95845..e9a25ce33 100644
--- a/src/renderer/context/App.test.tsx
+++ b/src/renderer/context/App.test.tsx
@@ -1,17 +1,17 @@
 import { act, fireEvent, waitFor } from '@testing-library/react';
-import { useContext } from 'react';
 
 import { renderWithAppContext } from '../__helpers__/test-utils';
 import { mockGitifyNotification } from '../__mocks__/notifications-mocks';
 import { mockSettings } from '../__mocks__/state-mocks';
 import { Constants } from '../constants';
+import { useAppContext } from '../hooks/useAppContext';
 import { useNotifications } from '../hooks/useNotifications';
 import type { AuthState, Hostname, SettingsState, Token } from '../types';
 import * as apiRequests from '../utils/api/request';
 import * as notifications from '../utils/notifications/notifications';
 import * as storage from '../utils/storage';
 import * as tray from '../utils/tray';
-import { AppContext, type AppContextState, AppProvider } from './App';
+import { type AppContextState, AppProvider } from './App';
 import { defaultSettings } from './defaults';
 
 jest.mock('../hooks/useNotifications');
@@ -22,7 +22,8 @@ const renderContextButton = (
   ...args: unknown[]
 ) => {
   const TestComponent = () => {
-    const context = useContext(AppContext);
+    const context = useAppContext();
+
     const method = context[contextMethodName];
     return (
       <button
diff --git a/src/renderer/context/App.tsx b/src/renderer/context/App.tsx
index 8035535e4..ea60a516c 100644
--- a/src/renderer/context/App.tsx
+++ b/src/renderer/context/App.tsx
@@ -2,7 +2,6 @@ import {
   createContext,
   type ReactNode,
   useCallback,
-  useContext,
   useEffect,
   useMemo,
   useState,
@@ -115,18 +114,6 @@ export interface AppContextState {
 
 export const AppContext = createContext<Partial<AppContextState>>({});
 
-/**
- * Custom hook that provides type-safe access to AppContext.
- * Throws if used outside of AppProvider.
- */
-export function useAppContext(): AppContextState {
-  const context = useContext(AppContext);
-  if (!context || Object.keys(context).length === 0) {
-    throw new Error('useAppContext must be used within an AppProvider');
-  }
-  return context as AppContextState;
-}
-
 export const AppProvider = ({ children }: { children: ReactNode }) => {
   const existingState = loadState();
 
diff --git a/src/renderer/hooks/useAppContext.ts b/src/renderer/hooks/useAppContext.ts
new file mode 100644
index 000000000..3a379593c
--- /dev/null
+++ b/src/renderer/hooks/useAppContext.ts
@@ -0,0 +1,15 @@
+import { useContext } from 'react';
+
+import { AppContext, type AppContextState } from '../context/App';
+
+/**
+ * Custom hook that provides type-safe access to AppContext.
+ * Throws if used outside of AppProvider.
+ */
+export function useAppContext(): AppContextState {
+  const context = useContext(AppContext);
+  if (!context || Object.keys(context).length === 0) {
+    throw new Error('useAppContext must be used within an AppProvider');
+  }
+  return context as AppContextState;
+}
diff --git a/src/renderer/hooks/useShortcutActions.ts b/src/renderer/hooks/useShortcutActions.ts
index e78656ab4..be8bdd4f7 100644
--- a/src/renderer/hooks/useShortcutActions.ts
+++ b/src/renderer/hooks/useShortcutActions.ts
@@ -1,8 +1,8 @@
 import { useMemo } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 
-import { useAppContext } from '../context/App';
 import { quitApp } from '../utils/comms';
+import { useAppContext } from './useAppContext';
 
 type ShortcutName =
   | 'home'
@@ -14,8 +14,11 @@ type ShortcutName =
   | 'accounts';
 
 type ShortcutConfig = {
+  /** Shortcut key */
   key: string;
-  enabled: boolean;
+  /** If the shortcut key is enabled */
+  isAllowed: boolean;
+  /** Action the shortcut key should take */
   action: () => void;
 };
 
@@ -28,6 +31,7 @@ type ShortcutConfigs = Record<ShortcutName, ShortcutConfig>;
 export function useShortcutActions(): { shortcuts: ShortcutConfigs } {
   const navigate = useNavigate();
   const location = useLocation();
+
   const { fetchNotifications, isLoggedIn, status, settings, updateSetting } =
     useAppContext();
 
@@ -39,17 +43,17 @@ export function useShortcutActions(): { shortcuts: ShortcutConfigs } {
     return {
       home: {
         key: 'h',
-        enabled: true,
+        isAllowed: true,
         action: () => navigate('/', { replace: true }),
       },
       focusedMode: {
         key: 'w',
-        enabled: isLoggedIn && !isLoading,
+        isAllowed: isLoggedIn && !isLoading,
         action: () => updateSetting('participating', !settings.participating),
       },
       filters: {
         key: 'f',
-        enabled: isLoggedIn,
+        isAllowed: isLoggedIn,
         action: () => {
           if (isOnFiltersRoute) {
             navigate('/', { replace: true });
@@ -60,7 +64,7 @@ export function useShortcutActions(): { shortcuts: ShortcutConfigs } {
       },
       refresh: {
         key: 'r',
-        enabled: !isLoading,
+        isAllowed: !isLoading,
         action: () => {
           if (isLoading) {
             return;
@@ -71,7 +75,7 @@ export function useShortcutActions(): { shortcuts: ShortcutConfigs } {
       },
       settings: {
         key: 's',
-        enabled: isLoggedIn,
+        isAllowed: isLoggedIn,
         action: () => {
           if (isOnSettingsRoute) {
             navigate('/', { replace: true });
@@ -83,12 +87,12 @@ export function useShortcutActions(): { shortcuts: ShortcutConfigs } {
       },
       accounts: {
         key: 'a',
-        enabled: isLoggedIn && isOnSettingsRoute,
+        isAllowed: isLoggedIn && isOnSettingsRoute,
         action: () => navigate('/accounts'),
       },
       quit: {
         key: 'q',
-        enabled: !isLoggedIn || isOnSettingsRoute,
+        isAllowed: !isLoggedIn || isOnSettingsRoute,
         action: () => quitApp(),
       },
     };
diff --git a/src/renderer/routes/Accounts.tsx b/src/renderer/routes/Accounts.tsx
index 2f2539ddf..a57cd6f3c 100644
--- a/src/renderer/routes/Accounts.tsx
+++ b/src/renderer/routes/Accounts.tsx
@@ -26,7 +26,7 @@ import { Contents } from '../components/layout/Contents';
 import { Page } from '../components/layout/Page';
 import { Footer } from '../components/primitives/Footer';
 import { Header } from '../components/primitives/Header';
-import { useAppContext } from '../context/App';
+import { useAppContext } from '../hooks/useAppContext';
 import { type Account, Size } from '../types';
 import {
   formatAlternateOAuthScopes,
@@ -44,9 +44,10 @@ import { rendererLogError } from '../utils/logger';
 import { saveState } from '../utils/storage';
 
 export const AccountsRoute: FC = () => {
+  const navigate = useNavigate();
+
   const { auth, settings, loginWithGitHubApp, logoutFromAccount } =
     useAppContext();
-  const navigate = useNavigate();
 
   const [loadingStates, setLoadingStates] = useState<Record<string, boolean>>(
     {},
diff --git a/src/renderer/routes/Filters.tsx b/src/renderer/routes/Filters.tsx
index cccb634c6..ded4e9d4e 100644
--- a/src/renderer/routes/Filters.tsx
+++ b/src/renderer/routes/Filters.tsx
@@ -12,7 +12,7 @@ import { Contents } from '../components/layout/Contents';
 import { Page } from '../components/layout/Page';
 import { Footer } from '../components/primitives/Footer';
 import { Header } from '../components/primitives/Header';
-import { useAppContext } from '../context/App';
+import { useAppContext } from '../hooks/useAppContext';
 
 export const FiltersRoute: FC = () => {
   const { clearFilters } = useAppContext();
diff --git a/src/renderer/routes/Login.tsx b/src/renderer/routes/Login.tsx
index c79bae8fb..f7dc10957 100644
--- a/src/renderer/routes/Login.tsx
+++ b/src/renderer/routes/Login.tsx
@@ -6,13 +6,14 @@ import { Button, Heading, Stack, Text } from '@primer/react';
 
 import { LogoIcon } from '../components/icons/LogoIcon';
 import { Centered } from '../components/layout/Centered';
-import { useAppContext } from '../context/App';
+import { useAppContext } from '../hooks/useAppContext';
 import { Size } from '../types';
 import { showWindow } from '../utils/comms';
 import { rendererLogError } from '../utils/logger';
 
 export const LoginRoute: FC = () => {
   const navigate = useNavigate();
+
   const { loginWithGitHubApp, isLoggedIn } = useAppContext();
 
   useEffect(() => {
diff --git a/src/renderer/routes/LoginWithOAuthApp.tsx b/src/renderer/routes/LoginWithOAuthApp.tsx
index 423296f91..cecf0f9fb 100644
--- a/src/renderer/routes/LoginWithOAuthApp.tsx
+++ b/src/renderer/routes/LoginWithOAuthApp.tsx
@@ -23,7 +23,7 @@ import { Page } from '../components/layout/Page';
 import { Footer } from '../components/primitives/Footer';
 import { Header } from '../components/primitives/Header';
 import { Constants } from '../constants';
-import { useAppContext } from '../context/App';
+import { useAppContext } from '../hooks/useAppContext';
 import type { ClientID, ClientSecret, Hostname, Token } from '../types';
 import type { LoginOAuthAppOptions } from '../utils/auth/types';
 import {
diff --git a/src/renderer/routes/LoginWithPersonalAccessToken.tsx b/src/renderer/routes/LoginWithPersonalAccessToken.tsx
index 8c78c0c9a..f8ac747c5 100644
--- a/src/renderer/routes/LoginWithPersonalAccessToken.tsx
+++ b/src/renderer/routes/LoginWithPersonalAccessToken.tsx
@@ -23,7 +23,7 @@ import { Page } from '../components/layout/Page';
 import { Footer } from '../components/primitives/Footer';
 import { Header } from '../components/primitives/Header';
 import { Constants } from '../constants';
-import { useAppContext } from '../context/App';
+import { useAppContext } from '../hooks/useAppContext';
 import type { Hostname, Token } from '../types';
 import type { LoginPersonalAccessTokenOptions } from '../utils/auth/types';
 import {
diff --git a/src/renderer/routes/Notifications.tsx b/src/renderer/routes/Notifications.tsx
index 04aabcc1a..61299a9de 100644
--- a/src/renderer/routes/Notifications.tsx
+++ b/src/renderer/routes/Notifications.tsx
@@ -5,7 +5,7 @@ import { Contents } from '../components/layout/Contents';
 import { Page } from '../components/layout/Page';
 import { AccountNotifications } from '../components/notifications/AccountNotifications';
 import { Oops } from '../components/Oops';
-import { useAppContext } from '../context/App';
+import { useAppContext } from '../hooks/useAppContext';
 import { getAccountUUID } from '../utils/auth/utils';
 
 export const NotificationsRoute: FC = () => {
diff --git a/src/renderer/utils/api/graphql/generated/graphql.ts b/src/renderer/utils/api/graphql/generated/graphql.ts
index 27c139003..9802e1530 100644
--- a/src/renderer/utils/api/graphql/generated/graphql.ts
+++ b/src/renderer/utils/api/graphql/generated/graphql.ts
@@ -7506,10 +7506,11 @@ export type EnterpriseOwnerInfo = {
   samlIdentityProviderSettingOrganizations: OrganizationConnection;
   /** A list of members with a support entitlement. */
   supportEntitlements: EnterpriseMemberConnection;
-  /** The setting value for whether team discussions are enabled for organizations in this enterprise. */
+  /**
+   * The setting value for whether team discussions are enabled for organizations in this enterprise.
+   * @deprecated The Team Discussions feature is deprecated in favor of Organization Discussions. Follow the guide at https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/ to find a suitable replacement. Removal on 2024-07-01 UTC.
+   */
   teamDiscussionsSetting: EnterpriseEnabledDisabledSettingValue;
-  /** A list of enterprise organizations configured with the provided team discussions setting value. */
-  teamDiscussionsSettingOrganizations: OrganizationConnection;
   /** The setting value for what methods of two-factor authentication the enterprise prevents its users from having. */
   twoFactorDisallowedMethodsSetting: EnterpriseDisallowedMethodsSettingValue;
   /** The setting value for whether the enterprise requires two-factor authentication for its organizations and users. */
@@ -7801,17 +7802,6 @@ export type EnterpriseOwnerInfoSupportEntitlementsArgs = {
 };
 
 
-/** Enterprise information visible to enterprise owners or enterprise owners' personal access tokens (classic) with read:enterprise or admin:enterprise scope. */
-export type EnterpriseOwnerInfoTeamDiscussionsSettingOrganizationsArgs = {
-  after?: InputMaybe<Scalars['String']['input']>;
-  before?: InputMaybe<Scalars['String']['input']>;
-  first?: InputMaybe<Scalars['Int']['input']>;
-  last?: InputMaybe<Scalars['Int']['input']>;
-  orderBy?: InputMaybe<OrganizationOrder>;
-  value: Scalars['Boolean']['input'];
-};
-
-
 /** Enterprise information visible to enterprise owners or enterprise owners' personal access tokens (classic) with read:enterprise or admin:enterprise scope. */
 export type EnterpriseOwnerInfoTwoFactorRequiredSettingOrganizationsArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
@@ -12536,8 +12526,6 @@ export type Mutation = {
   updateEnterpriseProfile?: Maybe<UpdateEnterpriseProfilePayload>;
   /** Sets whether repository projects are enabled for a enterprise. */
   updateEnterpriseRepositoryProjectsSetting?: Maybe<UpdateEnterpriseRepositoryProjectsSettingPayload>;
-  /** Sets whether team discussions are enabled for an enterprise. */
-  updateEnterpriseTeamDiscussionsSetting?: Maybe<UpdateEnterpriseTeamDiscussionsSettingPayload>;
   /** Sets the two-factor authentication methods that users of an enterprise may not use. */
   updateEnterpriseTwoFactorAuthenticationDisallowedMethodsSetting?: Maybe<UpdateEnterpriseTwoFactorAuthenticationDisallowedMethodsSettingPayload>;
   /** Sets whether two factor authentication is required for all users in an enterprise. */
@@ -13910,12 +13898,6 @@ export type MutationUpdateEnterpriseRepositoryProjectsSettingArgs = {
 };
 
 
-/** The root query for implementing GraphQL mutations. */
-export type MutationUpdateEnterpriseTeamDiscussionsSettingArgs = {
-  input: UpdateEnterpriseTeamDiscussionsSettingInput;
-};
-
-
 /** The root query for implementing GraphQL mutations. */
 export type MutationUpdateEnterpriseTwoFactorAuthenticationDisallowedMethodsSettingArgs = {
   input: UpdateEnterpriseTwoFactorAuthenticationDisallowedMethodsSettingInput;
@@ -33259,27 +33241,6 @@ export type UpdateEnterpriseRepositoryProjectsSettingPayload = {
   message?: Maybe<Scalars['String']['output']>;
 };
 
-/** Autogenerated input type of UpdateEnterpriseTeamDiscussionsSetting */
-export type UpdateEnterpriseTeamDiscussionsSettingInput = {
-  /** A unique identifier for the client performing the mutation. */
-  clientMutationId?: InputMaybe<Scalars['String']['input']>;
-  /** The ID of the enterprise on which to set the team discussions setting. */
-  enterpriseId: Scalars['ID']['input'];
-  /** The value for the team discussions setting on the enterprise. */
-  settingValue: EnterpriseEnabledDisabledSettingValue;
-};
-
-/** Autogenerated return type of UpdateEnterpriseTeamDiscussionsSetting. */
-export type UpdateEnterpriseTeamDiscussionsSettingPayload = {
-  __typename?: 'UpdateEnterpriseTeamDiscussionsSettingPayload';
-  /** A unique identifier for the client performing the mutation. */
-  clientMutationId?: Maybe<Scalars['String']['output']>;
-  /** The enterprise with the updated team discussions setting. */
-  enterprise?: Maybe<Enterprise>;
-  /** A message confirming the result of updating the team discussions setting. */
-  message?: Maybe<Scalars['String']['output']>;
-};
-
 /** Autogenerated input type of UpdateEnterpriseTwoFactorAuthenticationDisallowedMethodsSetting */
 export type UpdateEnterpriseTwoFactorAuthenticationDisallowedMethodsSettingInput = {
   /** A unique identifier for the client performing the mutation. */

From b1585ac8a4ce04b9ae295475c4adf5c75ea366ad Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Thu, 15 Jan 2026 15:48:27 -0500
Subject: [PATCH 12/17] feat: hotkeys

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/renderer/App.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index d652819ae..20454c110 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -41,8 +41,8 @@ export const App = () => {
     <ThemeProvider>
       <BaseStyles>
         <AppProvider>
+          <GlobalShortcuts />
           <Router>
-            <GlobalShortcuts />
             <AppLayout>
               <Routes>
                 <Route

From 2cf9068c60559807690c841163072fc8ca6d44a8 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Thu, 15 Jan 2026 16:06:09 -0500
Subject: [PATCH 13/17] feat: hotkeys

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/renderer/components/Sidebar.test.tsx      |  4 +-
 src/renderer/components/Sidebar.tsx           |  2 +-
 .../__snapshots__/Sidebar.test.tsx.snap       | 96 +------------------
 .../__snapshots__/AppLayout.test.tsx.snap     | 96 +------------------
 4 files changed, 7 insertions(+), 191 deletions(-)

diff --git a/src/renderer/components/Sidebar.test.tsx b/src/renderer/components/Sidebar.test.tsx
index 493d8396f..aea93ddd9 100644
--- a/src/renderer/components/Sidebar.test.tsx
+++ b/src/renderer/components/Sidebar.test.tsx
@@ -28,7 +28,7 @@ describe('renderer/components/Sidebar.tsx', () => {
 
   it('should render itself & its children (logged in)', () => {
     const tree = renderWithAppContext(
-      <MemoryRouter>
+      <MemoryRouter initialEntries={['/']}>
         <Sidebar />
       </MemoryRouter>,
       {
@@ -41,7 +41,7 @@ describe('renderer/components/Sidebar.tsx', () => {
 
   it('should render itself & its children (logged out)', () => {
     const tree = renderWithAppContext(
-      <MemoryRouter>
+      <MemoryRouter initialEntries={['/landing']}>
         <Sidebar />
       </MemoryRouter>,
       {
diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx
index 6bead9086..8dd84c862 100644
--- a/src/renderer/components/Sidebar.tsx
+++ b/src/renderer/components/Sidebar.tsx
@@ -144,7 +144,7 @@ export const Sidebar: FC = () => {
               className={status === 'loading' ? 'animate-spin' : ''}
               data-testid="sidebar-refresh"
               description="Refresh notifications"
-              disabled={!isLoading}
+              disabled={isLoading}
               icon={SyncIcon}
               keybindingHint={shortcuts.refresh.key}
               // loading={status === 'loading'}
diff --git a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
index 02f26a23f..429b758e0 100644
--- a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
+++ b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
@@ -507,7 +507,6 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_ID_"
                 aria-label="Refresh"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -516,6 +515,7 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 data-size="small"
                 data-testid="sidebar-refresh"
                 data-variant="invisible"
+                disabled=""
                 type="button"
               >
                 <svg
@@ -535,52 +535,6 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                   />
                 </svg>
               </button>
-              <span
-                aria-hidden="true"
-                class="prc-TooltipV2-Tooltip-tLeuB"
-                data-direction="e"
-                popover="auto"
-                role="tooltip"
-              >
-                <span
-                  id="_r_ID_"
-                >
-                  Refresh notifications
-                  <span
-                    class="prc-src-InternalVisuallyHidden-2YaI6"
-                  >
-                    (
-                    r
-                    )
-                  </span>
-                </span>
-                <span
-                  aria-hidden="true"
-                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-                >
-                  <kbd
-                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                    data-testid="keybinding-hint"
-                  >
-                    <span
-                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                      data-kbd-chord="true"
-                    >
-                       
-                      <span
-                        class="prc-src-InternalVisuallyHidden-2YaI6"
-                      >
-                        r
-                      </span>
-                      <span
-                        aria-hidden="true"
-                      >
-                        R
-                      </span>
-                    </span>
-                  </kbd>
-                </span>
-              </span>
               <button
                 aria-describedby="_r_ID_"
                 aria-label="Settings"
@@ -1069,7 +1023,6 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_ID_"
               aria-label="Refresh"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -1078,6 +1031,7 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               data-size="small"
               data-testid="sidebar-refresh"
               data-variant="invisible"
+              disabled=""
               type="button"
             >
               <svg
@@ -1097,52 +1051,6 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 />
               </svg>
             </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-tLeuB"
-              data-direction="e"
-              popover="auto"
-              role="tooltip"
-            >
-              <span
-                id="_r_ID_"
-              >
-                Refresh notifications
-                <span
-                  class="prc-src-InternalVisuallyHidden-2YaI6"
-                >
-                  (
-                  r
-                  )
-                </span>
-              </span>
-              <span
-                aria-hidden="true"
-                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-              >
-                <kbd
-                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                  data-testid="keybinding-hint"
-                >
-                  <span
-                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                    data-kbd-chord="true"
-                  >
-                     
-                    <span
-                      class="prc-src-InternalVisuallyHidden-2YaI6"
-                    >
-                      r
-                    </span>
-                    <span
-                      aria-hidden="true"
-                    >
-                      R
-                    </span>
-                  </span>
-                </kbd>
-              </span>
-            </span>
             <button
               aria-describedby="_r_ID_"
               aria-label="Settings"
diff --git a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
index c6dead6f5..3cdc3c593 100644
--- a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
@@ -421,7 +421,6 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 data-wrap="nowrap"
               >
                 <button
-                  aria-describedby="_r_ID_"
                   aria-label="Refresh"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
@@ -430,6 +429,7 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   data-size="small"
                   data-testid="sidebar-refresh"
                   data-variant="invisible"
+                  disabled=""
                   type="button"
                 >
                   <svg
@@ -449,52 +449,6 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                     />
                   </svg>
                 </button>
-                <span
-                  aria-hidden="true"
-                  class="prc-TooltipV2-Tooltip-tLeuB"
-                  data-direction="e"
-                  popover="auto"
-                  role="tooltip"
-                >
-                  <span
-                    id="_r_ID_"
-                  >
-                    Refresh notifications
-                    <span
-                      class="prc-src-InternalVisuallyHidden-2YaI6"
-                    >
-                      (
-                      r
-                      )
-                    </span>
-                  </span>
-                  <span
-                    aria-hidden="true"
-                    class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-                  >
-                    <kbd
-                      class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                      data-testid="keybinding-hint"
-                    >
-                      <span
-                        class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                        data-kbd-chord="true"
-                      >
-                         
-                        <span
-                          class="prc-src-InternalVisuallyHidden-2YaI6"
-                        >
-                          r
-                        </span>
-                        <span
-                          aria-hidden="true"
-                        >
-                          R
-                        </span>
-                      </span>
-                    </kbd>
-                  </span>
-                </span>
                 <button
                   aria-describedby="_r_ID_"
                   aria-label="Settings"
@@ -999,7 +953,6 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_ID_"
                 aria-label="Refresh"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1008,6 +961,7 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 data-size="small"
                 data-testid="sidebar-refresh"
                 data-variant="invisible"
+                disabled=""
                 type="button"
               >
                 <svg
@@ -1027,52 +981,6 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   />
                 </svg>
               </button>
-              <span
-                aria-hidden="true"
-                class="prc-TooltipV2-Tooltip-tLeuB"
-                data-direction="e"
-                popover="auto"
-                role="tooltip"
-              >
-                <span
-                  id="_r_ID_"
-                >
-                  Refresh notifications
-                  <span
-                    class="prc-src-InternalVisuallyHidden-2YaI6"
-                  >
-                    (
-                    r
-                    )
-                  </span>
-                </span>
-                <span
-                  aria-hidden="true"
-                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-                >
-                  <kbd
-                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                    data-testid="keybinding-hint"
-                  >
-                    <span
-                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                      data-kbd-chord="true"
-                    >
-                       
-                      <span
-                        class="prc-src-InternalVisuallyHidden-2YaI6"
-                      >
-                        r
-                      </span>
-                      <span
-                        aria-hidden="true"
-                      >
-                        R
-                      </span>
-                    </span>
-                  </kbd>
-                </span>
-              </span>
               <button
                 aria-describedby="_r_ID_"
                 aria-label="Settings"

From 6201d79964a007156f8c62e953b90e7836e4eec7 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Thu, 15 Jan 2026 16:06:14 -0500
Subject: [PATCH 14/17] feat: hotkeys

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 .../__snapshots__/AppLayout.test.tsx.snap     | 96 ++++++++++++++++++-
 1 file changed, 94 insertions(+), 2 deletions(-)

diff --git a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
index 3cdc3c593..c6dead6f5 100644
--- a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
@@ -421,6 +421,7 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 data-wrap="nowrap"
               >
                 <button
+                  aria-describedby="_r_ID_"
                   aria-label="Refresh"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
@@ -429,7 +430,6 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   data-size="small"
                   data-testid="sidebar-refresh"
                   data-variant="invisible"
-                  disabled=""
                   type="button"
                 >
                   <svg
@@ -449,6 +449,52 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                     />
                   </svg>
                 </button>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-Tooltip-tLeuB"
+                  data-direction="e"
+                  popover="auto"
+                  role="tooltip"
+                >
+                  <span
+                    id="_r_ID_"
+                  >
+                    Refresh notifications
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      (
+                      r
+                      )
+                    </span>
+                  </span>
+                  <span
+                    aria-hidden="true"
+                    class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                  >
+                    <kbd
+                      class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                      data-testid="keybinding-hint"
+                    >
+                      <span
+                        class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                        data-kbd-chord="true"
+                      >
+                         
+                        <span
+                          class="prc-src-InternalVisuallyHidden-2YaI6"
+                        >
+                          r
+                        </span>
+                        <span
+                          aria-hidden="true"
+                        >
+                          R
+                        </span>
+                      </span>
+                    </kbd>
+                  </span>
+                </span>
                 <button
                   aria-describedby="_r_ID_"
                   aria-label="Settings"
@@ -953,6 +999,7 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
               data-wrap="nowrap"
             >
               <button
+                aria-describedby="_r_ID_"
                 aria-label="Refresh"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -961,7 +1008,6 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 data-size="small"
                 data-testid="sidebar-refresh"
                 data-variant="invisible"
-                disabled=""
                 type="button"
               >
                 <svg
@@ -981,6 +1027,52 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   />
                 </svg>
               </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-tLeuB"
+                data-direction="e"
+                popover="auto"
+                role="tooltip"
+              >
+                <span
+                  id="_r_ID_"
+                >
+                  Refresh notifications
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    r
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        r
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        R
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
+              </span>
               <button
                 aria-describedby="_r_ID_"
                 aria-label="Settings"

From 1d1893f1ed0ae73a927d514c914f10c91fe26367 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Thu, 15 Jan 2026 16:06:21 -0500
Subject: [PATCH 15/17] feat: hotkeys

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 .../__snapshots__/Sidebar.test.tsx.snap       | 96 ++++++++++++++++++-
 1 file changed, 94 insertions(+), 2 deletions(-)

diff --git a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
index 429b758e0..02f26a23f 100644
--- a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
+++ b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
@@ -507,6 +507,7 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               data-wrap="nowrap"
             >
               <button
+                aria-describedby="_r_ID_"
                 aria-label="Refresh"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -515,7 +516,6 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 data-size="small"
                 data-testid="sidebar-refresh"
                 data-variant="invisible"
-                disabled=""
                 type="button"
               >
                 <svg
@@ -535,6 +535,52 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                   />
                 </svg>
               </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-tLeuB"
+                data-direction="e"
+                popover="auto"
+                role="tooltip"
+              >
+                <span
+                  id="_r_ID_"
+                >
+                  Refresh notifications
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    r
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        r
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        R
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
+              </span>
               <button
                 aria-describedby="_r_ID_"
                 aria-label="Settings"
@@ -1023,6 +1069,7 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
             data-wrap="nowrap"
           >
             <button
+              aria-describedby="_r_ID_"
               aria-label="Refresh"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -1031,7 +1078,6 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               data-size="small"
               data-testid="sidebar-refresh"
               data-variant="invisible"
-              disabled=""
               type="button"
             >
               <svg
@@ -1051,6 +1097,52 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 />
               </svg>
             </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="e"
+              popover="auto"
+              role="tooltip"
+            >
+              <span
+                id="_r_ID_"
+              >
+                Refresh notifications
+                <span
+                  class="prc-src-InternalVisuallyHidden-2YaI6"
+                >
+                  (
+                  r
+                  )
+                </span>
+              </span>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+              >
+                <kbd
+                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                  data-testid="keybinding-hint"
+                >
+                  <span
+                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                    data-kbd-chord="true"
+                  >
+                     
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      r
+                    </span>
+                    <span
+                      aria-hidden="true"
+                    >
+                      R
+                    </span>
+                  </span>
+                </kbd>
+              </span>
+            </span>
             <button
               aria-describedby="_r_ID_"
               aria-label="Settings"

From cd9b3b845b343f5510e2309bddf68dab63b33ac2 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Fri, 16 Jan 2026 14:30:25 -0500
Subject: [PATCH 16/17] feat: hotkeys

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/renderer/hooks/useShortcutActions.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/hooks/useShortcutActions.ts b/src/renderer/hooks/useShortcutActions.ts
index be8bdd4f7..cbd06b8a4 100644
--- a/src/renderer/hooks/useShortcutActions.ts
+++ b/src/renderer/hooks/useShortcutActions.ts
@@ -6,10 +6,10 @@ import { useAppContext } from './useAppContext';
 
 type ShortcutName =
   | 'home'
+  | 'focusedMode'
+  | 'filters'
   | 'refresh'
   | 'settings'
-  | 'filters'
-  | 'focusedMode'
   | 'quit'
   | 'accounts';
 

From 0efd2cc25c6333712c00df55a4dd703f7ced895a Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Fri, 16 Jan 2026 15:54:10 -0500
Subject: [PATCH 17/17] feat: hotkeys

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/renderer/App.tsx                          |   2 +-
 .../components/GlobalShortcuts.test.tsx       | 123 +++++
 src/renderer/components/Sidebar.tsx           |  18 +-
 .../__snapshots__/Sidebar.test.tsx.snap       | 480 +++++++++++++++++-
 .../__snapshots__/AppLayout.test.tsx.snap     | 240 ++++++++-
 src/renderer/hooks/useShortcutActions.ts      |  36 +-
 6 files changed, 848 insertions(+), 51 deletions(-)

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index 20454c110..d652819ae 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -41,8 +41,8 @@ export const App = () => {
     <ThemeProvider>
       <BaseStyles>
         <AppProvider>
-          <GlobalShortcuts />
           <Router>
+            <GlobalShortcuts />
             <AppLayout>
               <Routes>
                 <Route
diff --git a/src/renderer/components/GlobalShortcuts.test.tsx b/src/renderer/components/GlobalShortcuts.test.tsx
index 3c859d7e5..c31fe3bc4 100644
--- a/src/renderer/components/GlobalShortcuts.test.tsx
+++ b/src/renderer/components/GlobalShortcuts.test.tsx
@@ -4,6 +4,7 @@ import { MemoryRouter } from 'react-router-dom';
 import { renderWithAppContext } from '../__helpers__/test-utils';
 
 import * as comms from '../utils/comms';
+import * as links from '../utils/links';
 import { GlobalShortcuts } from './GlobalShortcuts';
 
 const navigateMock = jest.fn();
@@ -22,6 +23,20 @@ describe('components/GlobalShortcuts.tsx', () => {
   });
 
   describe('key bindings', () => {
+    describe('ignores keys that are not valid', () => {
+      it('ignores B key', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+        );
+
+        await userEvent.keyboard('b');
+
+        expect(navigateMock).not.toHaveBeenCalled();
+      });
+    });
+
     describe('home', () => {
       it('navigates home when pressing H key', async () => {
         renderWithAppContext(
@@ -36,6 +51,42 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
     });
 
+    describe('openGitHubNotifications', () => {
+      const openGitHubNotificationsSpy = jest
+        .spyOn(links, 'openGitHubNotifications')
+        .mockImplementation();
+
+      it('opens primary account GitHub notifications webpage when pressing N while logged in', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+          {
+            isLoggedIn: true,
+          },
+        );
+
+        await userEvent.keyboard('n');
+
+        expect(openGitHubNotificationsSpy).toHaveBeenCalledTimes(1);
+      });
+
+      it('does not open primary account GitHub notifications webpage when logged out', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+          {
+            isLoggedIn: false,
+          },
+        );
+
+        await userEvent.keyboard('n');
+
+        expect(openGitHubNotificationsSpy).not.toHaveBeenCalled();
+      });
+    });
+
     describe('focus mode', () => {
       it('toggles focus when pressing W while logged in', async () => {
         renderWithAppContext(
@@ -119,6 +170,78 @@ describe('components/GlobalShortcuts.tsx', () => {
       });
     });
 
+    describe('openGitHubIssues', () => {
+      const openGitHubIssuesSpy = jest
+        .spyOn(links, 'openGitHubIssues')
+        .mockImplementation();
+
+      it('opens primary account GitHub issues webpage when pressing I while logged in', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+          {
+            isLoggedIn: true,
+          },
+        );
+
+        await userEvent.keyboard('i');
+
+        expect(openGitHubIssuesSpy).toHaveBeenCalledTimes(1);
+      });
+
+      it('does not open primary account GitHub issues webpage when logged out', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+          {
+            isLoggedIn: false,
+          },
+        );
+
+        await userEvent.keyboard('n');
+
+        expect(openGitHubIssuesSpy).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('openGitHubPulls', () => {
+      const openGitHubPullsSpy = jest
+        .spyOn(links, 'openGitHubPulls')
+        .mockImplementation();
+
+      it('opens primary account GitHub pull requests webpage when pressing N while logged in', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+          {
+            isLoggedIn: true,
+          },
+        );
+
+        await userEvent.keyboard('p');
+
+        expect(openGitHubPullsSpy).toHaveBeenCalledTimes(1);
+      });
+
+      it('does not open primary account GitHub pull requests webpage when logged out', async () => {
+        renderWithAppContext(
+          <MemoryRouter>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+          {
+            isLoggedIn: false,
+          },
+        );
+
+        await userEvent.keyboard('n');
+
+        expect(openGitHubPullsSpy).not.toHaveBeenCalled();
+      });
+    });
+
     describe('refresh', () => {
       it('refreshes notifications when pressing R key', async () => {
         renderWithAppContext(
diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx
index 8dd84c862..d63150fcc 100644
--- a/src/renderer/components/Sidebar.tsx
+++ b/src/renderer/components/Sidebar.tsx
@@ -18,12 +18,6 @@ import { APPLICATION } from '../../shared/constants';
 import { useAppContext } from '../hooks/useAppContext';
 import { useShortcutActions } from '../hooks/useShortcutActions';
 
-import { getPrimaryAccountHostname } from '../utils/auth/utils';
-import {
-  openGitHubIssues,
-  openGitHubNotifications,
-  openGitHubPulls,
-} from '../utils/links';
 import { hasActiveFilters } from '../utils/notifications/filters/filter';
 import { LogoIcon } from './icons/LogoIcon';
 
@@ -32,13 +26,10 @@ export const Sidebar: FC = () => {
     status,
     isLoggedIn,
     settings,
-    auth,
     notificationCount,
     hasUnreadNotifications,
   } = useAppContext();
 
-  const primaryAccountHostname = getPrimaryAccountHostname(auth);
-
   const { shortcuts } = useShortcutActions();
 
   const isLoading = status === 'loading';
@@ -72,7 +63,8 @@ export const Sidebar: FC = () => {
           data-testid="sidebar-notifications"
           description={`${notificationCount} ${settings.fetchReadNotifications ? 'notifications' : 'unread notifications'} ↗`}
           icon={BellIcon}
-          onClick={() => openGitHubNotifications(primaryAccountHostname)}
+          keybindingHint={shortcuts.myNotifications.key}
+          onClick={() => shortcuts.myNotifications.action()}
           size="small"
           tooltipDirection="e"
           variant={hasUnreadNotifications ? 'primary' : 'invisible'}
@@ -114,7 +106,8 @@ export const Sidebar: FC = () => {
           aria-label="My issues ↗"
           data-testid="sidebar-my-issues"
           icon={IssueOpenedIcon}
-          onClick={() => openGitHubIssues(primaryAccountHostname)}
+          keybindingHint={shortcuts.myIssues.key}
+          onClick={() => shortcuts.myIssues.action()}
           size="small"
           tooltipDirection="e"
           variant="invisible"
@@ -124,7 +117,8 @@ export const Sidebar: FC = () => {
           aria-label="My pull requests ↗"
           data-testid="sidebar-my-pull-requests"
           icon={GitPullRequestIcon}
-          onClick={() => openGitHubPulls(primaryAccountHostname)}
+          keybindingHint={shortcuts.myPullRequests.key}
+          onClick={() => shortcuts.myPullRequests.action()}
           size="small"
           tooltipDirection="e"
           variant="invisible"
diff --git a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
index 02f26a23f..57a68a8bb 100644
--- a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
+++ b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
@@ -263,11 +263,47 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_ID_"
                 popover="auto"
                 role="tooltip"
               >
-                0 unread notifications ↗
+                <span
+                  id="_r_ID_"
+                >
+                  0 unread notifications ↗
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    n
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        n
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        N
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
               </span>
               <button
                 aria-describedby="_r_ID_"
@@ -454,10 +490,46 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_ID_"
                 popover="auto"
               >
-                My issues ↗
+                <span
+                  id="_r_ID_"
+                >
+                  My issues ↗
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    i
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        i
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        I
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
               </span>
               <button
                 aria-labelledby="_r_ID_"
@@ -491,10 +563,46 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_ID_"
                 popover="auto"
               >
-                My pull requests ↗
+                <span
+                  id="_r_ID_"
+                >
+                  My pull requests ↗
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    p
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        p
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        P
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
               </span>
             </div>
             <div
@@ -825,11 +933,47 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
               data-direction="e"
-              id="_r_ID_"
               popover="auto"
               role="tooltip"
             >
-              0 unread notifications ↗
+              <span
+                id="_r_ID_"
+              >
+                0 unread notifications ↗
+                <span
+                  class="prc-src-InternalVisuallyHidden-2YaI6"
+                >
+                  (
+                  n
+                  )
+                </span>
+              </span>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+              >
+                <kbd
+                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                  data-testid="keybinding-hint"
+                >
+                  <span
+                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                    data-kbd-chord="true"
+                  >
+                     
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      n
+                    </span>
+                    <span
+                      aria-hidden="true"
+                    >
+                      N
+                    </span>
+                  </span>
+                </kbd>
+              </span>
             </span>
             <button
               aria-describedby="_r_ID_"
@@ -1016,10 +1160,46 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
               data-direction="e"
-              id="_r_ID_"
               popover="auto"
             >
-              My issues ↗
+              <span
+                id="_r_ID_"
+              >
+                My issues ↗
+                <span
+                  class="prc-src-InternalVisuallyHidden-2YaI6"
+                >
+                  (
+                  i
+                  )
+                </span>
+              </span>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+              >
+                <kbd
+                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                  data-testid="keybinding-hint"
+                >
+                  <span
+                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                    data-kbd-chord="true"
+                  >
+                     
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      i
+                    </span>
+                    <span
+                      aria-hidden="true"
+                    >
+                      I
+                    </span>
+                  </span>
+                </kbd>
+              </span>
             </span>
             <button
               aria-labelledby="_r_ID_"
@@ -1053,10 +1233,46 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
               data-direction="e"
-              id="_r_ID_"
               popover="auto"
             >
-              My pull requests ↗
+              <span
+                id="_r_ID_"
+              >
+                My pull requests ↗
+                <span
+                  class="prc-src-InternalVisuallyHidden-2YaI6"
+                >
+                  (
+                  p
+                  )
+                </span>
+              </span>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+              >
+                <kbd
+                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                  data-testid="keybinding-hint"
+                >
+                  <span
+                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                    data-kbd-chord="true"
+                  >
+                     
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      p
+                    </span>
+                    <span
+                      aria-hidden="true"
+                    >
+                      P
+                    </span>
+                  </span>
+                </kbd>
+              </span>
             </span>
           </div>
           <div
@@ -1444,11 +1660,47 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_ID_"
                 popover="auto"
                 role="tooltip"
               >
-                0 unread notifications ↗
+                <span
+                  id="_r_ID_"
+                >
+                  0 unread notifications ↗
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    n
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        n
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        N
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
               </span>
               <button
                 aria-labelledby="_r_ID_"
@@ -1485,10 +1737,46 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_ID_"
                 popover="auto"
               >
-                My issues ↗
+                <span
+                  id="_r_ID_"
+                >
+                  My issues ↗
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    i
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        i
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        I
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
               </span>
               <button
                 aria-labelledby="_r_ID_"
@@ -1522,10 +1810,46 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_ID_"
                 popover="auto"
               >
-                My pull requests ↗
+                <span
+                  id="_r_ID_"
+                >
+                  My pull requests ↗
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    p
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        p
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        P
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
               </span>
             </div>
             <div
@@ -1779,11 +2103,47 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
               data-direction="e"
-              id="_r_ID_"
               popover="auto"
               role="tooltip"
             >
-              0 unread notifications ↗
+              <span
+                id="_r_ID_"
+              >
+                0 unread notifications ↗
+                <span
+                  class="prc-src-InternalVisuallyHidden-2YaI6"
+                >
+                  (
+                  n
+                  )
+                </span>
+              </span>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+              >
+                <kbd
+                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                  data-testid="keybinding-hint"
+                >
+                  <span
+                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                    data-kbd-chord="true"
+                  >
+                     
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      n
+                    </span>
+                    <span
+                      aria-hidden="true"
+                    >
+                      N
+                    </span>
+                  </span>
+                </kbd>
+              </span>
             </span>
             <button
               aria-labelledby="_r_ID_"
@@ -1820,10 +2180,46 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
               data-direction="e"
-              id="_r_ID_"
               popover="auto"
             >
-              My issues ↗
+              <span
+                id="_r_ID_"
+              >
+                My issues ↗
+                <span
+                  class="prc-src-InternalVisuallyHidden-2YaI6"
+                >
+                  (
+                  i
+                  )
+                </span>
+              </span>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+              >
+                <kbd
+                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                  data-testid="keybinding-hint"
+                >
+                  <span
+                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                    data-kbd-chord="true"
+                  >
+                     
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      i
+                    </span>
+                    <span
+                      aria-hidden="true"
+                    >
+                      I
+                    </span>
+                  </span>
+                </kbd>
+              </span>
             </span>
             <button
               aria-labelledby="_r_ID_"
@@ -1857,10 +2253,46 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
               data-direction="e"
-              id="_r_ID_"
               popover="auto"
             >
-              My pull requests ↗
+              <span
+                id="_r_ID_"
+              >
+                My pull requests ↗
+                <span
+                  class="prc-src-InternalVisuallyHidden-2YaI6"
+                >
+                  (
+                  p
+                  )
+                </span>
+              </span>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+              >
+                <kbd
+                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                  data-testid="keybinding-hint"
+                >
+                  <span
+                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                    data-kbd-chord="true"
+                  >
+                     
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      p
+                    </span>
+                    <span
+                      aria-hidden="true"
+                    >
+                      P
+                    </span>
+                  </span>
+                </kbd>
+              </span>
             </span>
           </div>
           <div
diff --git a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
index c6dead6f5..254d0fa97 100644
--- a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
@@ -177,11 +177,47 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   aria-hidden="true"
                   class="prc-TooltipV2-Tooltip-tLeuB"
                   data-direction="e"
-                  id="_r_ID_"
                   popover="auto"
                   role="tooltip"
                 >
-                  0 unread notifications ↗
+                  <span
+                    id="_r_ID_"
+                  >
+                    0 unread notifications ↗
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      (
+                      n
+                      )
+                    </span>
+                  </span>
+                  <span
+                    aria-hidden="true"
+                    class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                  >
+                    <kbd
+                      class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                      data-testid="keybinding-hint"
+                    >
+                      <span
+                        class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                        data-kbd-chord="true"
+                      >
+                         
+                        <span
+                          class="prc-src-InternalVisuallyHidden-2YaI6"
+                        >
+                          n
+                        </span>
+                        <span
+                          aria-hidden="true"
+                        >
+                          N
+                        </span>
+                      </span>
+                    </kbd>
+                  </span>
                 </span>
                 <button
                   aria-describedby="_r_ID_"
@@ -368,10 +404,46 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   aria-hidden="true"
                   class="prc-TooltipV2-Tooltip-tLeuB"
                   data-direction="e"
-                  id="_r_ID_"
                   popover="auto"
                 >
-                  My issues ↗
+                  <span
+                    id="_r_ID_"
+                  >
+                    My issues ↗
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      (
+                      i
+                      )
+                    </span>
+                  </span>
+                  <span
+                    aria-hidden="true"
+                    class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                  >
+                    <kbd
+                      class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                      data-testid="keybinding-hint"
+                    >
+                      <span
+                        class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                        data-kbd-chord="true"
+                      >
+                         
+                        <span
+                          class="prc-src-InternalVisuallyHidden-2YaI6"
+                        >
+                          i
+                        </span>
+                        <span
+                          aria-hidden="true"
+                        >
+                          I
+                        </span>
+                      </span>
+                    </kbd>
+                  </span>
                 </span>
                 <button
                   aria-labelledby="_r_ID_"
@@ -405,10 +477,46 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   aria-hidden="true"
                   class="prc-TooltipV2-Tooltip-tLeuB"
                   data-direction="e"
-                  id="_r_ID_"
                   popover="auto"
                 >
-                  My pull requests ↗
+                  <span
+                    id="_r_ID_"
+                  >
+                    My pull requests ↗
+                    <span
+                      class="prc-src-InternalVisuallyHidden-2YaI6"
+                    >
+                      (
+                      p
+                      )
+                    </span>
+                  </span>
+                  <span
+                    aria-hidden="true"
+                    class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                  >
+                    <kbd
+                      class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                      data-testid="keybinding-hint"
+                    >
+                      <span
+                        class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                        data-kbd-chord="true"
+                      >
+                         
+                        <span
+                          class="prc-src-InternalVisuallyHidden-2YaI6"
+                        >
+                          p
+                        </span>
+                        <span
+                          aria-hidden="true"
+                        >
+                          P
+                        </span>
+                      </span>
+                    </kbd>
+                  </span>
                 </span>
               </div>
               <div
@@ -755,11 +863,47 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_ID_"
                 popover="auto"
                 role="tooltip"
               >
-                0 unread notifications ↗
+                <span
+                  id="_r_ID_"
+                >
+                  0 unread notifications ↗
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    n
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        n
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        N
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
               </span>
               <button
                 aria-describedby="_r_ID_"
@@ -946,10 +1090,46 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_ID_"
                 popover="auto"
               >
-                My issues ↗
+                <span
+                  id="_r_ID_"
+                >
+                  My issues ↗
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    i
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        i
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        I
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
               </span>
               <button
                 aria-labelledby="_r_ID_"
@@ -983,10 +1163,46 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_ID_"
                 popover="auto"
               >
-                My pull requests ↗
+                <span
+                  id="_r_ID_"
+                >
+                  My pull requests ↗
+                  <span
+                    class="prc-src-InternalVisuallyHidden-2YaI6"
+                  >
+                    (
+                    p
+                    )
+                  </span>
+                </span>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+                >
+                  <kbd
+                    class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+                    data-testid="keybinding-hint"
+                  >
+                    <span
+                      class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                      data-kbd-chord="true"
+                    >
+                       
+                      <span
+                        class="prc-src-InternalVisuallyHidden-2YaI6"
+                      >
+                        p
+                      </span>
+                      <span
+                        aria-hidden="true"
+                      >
+                        P
+                      </span>
+                    </span>
+                  </kbd>
+                </span>
               </span>
             </div>
             <div
diff --git a/src/renderer/hooks/useShortcutActions.ts b/src/renderer/hooks/useShortcutActions.ts
index cbd06b8a4..758ee68f1 100644
--- a/src/renderer/hooks/useShortcutActions.ts
+++ b/src/renderer/hooks/useShortcutActions.ts
@@ -1,13 +1,22 @@
 import { useMemo } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 
+import { getPrimaryAccountHostname } from '../utils/auth/utils';
 import { quitApp } from '../utils/comms';
+import {
+  openGitHubIssues,
+  openGitHubNotifications,
+  openGitHubPulls,
+} from '../utils/links';
 import { useAppContext } from './useAppContext';
 
 type ShortcutName =
   | 'home'
+  | 'myNotifications'
   | 'focusedMode'
   | 'filters'
+  | 'myIssues'
+  | 'myPullRequests'
   | 'refresh'
   | 'settings'
   | 'quit'
@@ -32,13 +41,21 @@ export function useShortcutActions(): { shortcuts: ShortcutConfigs } {
   const navigate = useNavigate();
   const location = useLocation();
 
-  const { fetchNotifications, isLoggedIn, status, settings, updateSetting } =
-    useAppContext();
+  const {
+    auth,
+    fetchNotifications,
+    isLoggedIn,
+    status,
+    settings,
+    updateSetting,
+  } = useAppContext();
 
   const isOnFiltersRoute = location.pathname.startsWith('/filters');
   const isOnSettingsRoute = location.pathname.startsWith('/settings');
   const isLoading = status === 'loading';
 
+  const primaryAccountHostname = getPrimaryAccountHostname(auth);
+
   const shortcuts: ShortcutConfigs = useMemo(() => {
     return {
       home: {
@@ -46,6 +63,11 @@ export function useShortcutActions(): { shortcuts: ShortcutConfigs } {
         isAllowed: true,
         action: () => navigate('/', { replace: true }),
       },
+      myNotifications: {
+        key: 'n',
+        isAllowed: isLoggedIn,
+        action: () => openGitHubNotifications(primaryAccountHostname),
+      },
       focusedMode: {
         key: 'w',
         isAllowed: isLoggedIn && !isLoading,
@@ -62,6 +84,16 @@ export function useShortcutActions(): { shortcuts: ShortcutConfigs } {
           }
         },
       },
+      myIssues: {
+        key: 'i',
+        isAllowed: isLoggedIn,
+        action: () => openGitHubIssues(primaryAccountHostname),
+      },
+      myPullRequests: {
+        key: 'p',
+        isAllowed: isLoggedIn,
+        action: () => openGitHubPulls(primaryAccountHostname),
+      },
       refresh: {
         key: 'r',
         isAllowed: !isLoading,