diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index 2e130bf6a..d652819ae 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -8,7 +8,7 @@ import {
 
 import { BaseStyles, ThemeProvider } from '@primer/react';
 
-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';
@@ -17,14 +17,18 @@ import { LoginWithPersonalAccessTokenRoute } from './routes/LoginWithPersonalAcc
 import { NotificationsRoute } from './routes/Notifications';
 import { SettingsRoute } from './routes/Settings';
 
+import { GlobalShortcuts } from './components/GlobalShortcuts';
 import { AppLayout } from './components/layout/AppLayout';
 
 import './App.css';
 
+import { useAppContext } from './hooks/useAppContext';
+
 function RequireAuth({ children }) {
-  const { isLoggedIn } = useAppContext();
   const location = useLocation();
 
+  const { isLoggedIn } = useAppContext();
+
   return isLoggedIn ? (
     children
   ) : (
@@ -38,6 +42,7 @@ export const App = () => {
       <BaseStyles>
         <AppProvider>
           <Router>
+            <GlobalShortcuts />
             <AppLayout>
               <Routes>
                 <Route
diff --git a/src/renderer/components/AllRead.tsx b/src/renderer/components/AllRead.tsx
index 3500d26eb..4fc2e7bdd 100644
--- a/src/renderer/components/AllRead.tsx
+++ b/src/renderer/components/AllRead.tsx
@@ -2,7 +2,7 @@ import { type FC, useMemo } from 'react';
 
 import { Constants } from '../constants';
 
-import { useAppContext } from '../context/App';
+import { useAppContext } from '../hooks/useAppContext';
 
 import { EmojiSplash } from './layout/EmojiSplash';
 
diff --git a/src/renderer/components/GlobalShortcuts.test.tsx b/src/renderer/components/GlobalShortcuts.test.tsx
new file mode 100644
index 000000000..c31fe3bc4
--- /dev/null
+++ b/src/renderer/components/GlobalShortcuts.test.tsx
@@ -0,0 +1,433 @@
+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 * as links from '../utils/links';
+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('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(
+          <MemoryRouter>
+            <GlobalShortcuts />
+          </MemoryRouter>,
+        );
+
+        await userEvent.keyboard('h');
+
+        expect(navigateMock).toHaveBeenCalledWith('/', { replace: true });
+      });
+    });
+
+    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(
+          <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('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(
+          <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/GlobalShortcuts.tsx b/src/renderer/components/GlobalShortcuts.tsx
new file mode 100644
index 000000000..e678878b5
--- /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 { shortcuts } = useShortcutActions();
+
+  useEffect(() => {
+    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
+      if (
+        event.target instanceof HTMLInputElement ||
+        event.target instanceof HTMLTextAreaElement ||
+        event.metaKey ||
+        event.ctrlKey ||
+        event.altKey
+      ) {
+        return;
+      }
+
+      const key = event.key.toLowerCase();
+      const name = keyToName.get(key);
+      if (!name) {
+        return;
+      }
+
+      if (shortcuts[name].isAllowed) {
+        event.preventDefault();
+        shortcuts[name].action();
+      }
+    };
+
+    document.addEventListener('keydown', handler);
+    return () => {
+      document.removeEventListener('keydown', handler);
+    };
+  }, [shortcuts]);
+
+  return null;
+};
diff --git a/src/renderer/components/Sidebar.test.tsx b/src/renderer/components/Sidebar.test.tsx
index 875ac1f6e..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>,
       {
@@ -323,4 +323,5 @@ describe('renderer/components/Sidebar.tsx', () => {
 
     expect(quitAppSpy).toHaveBeenCalledTimes(1);
   });
+  // Keyboard bindings moved to App.test.tsx
 });
diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx
index 2000c12c1..d63150fcc 100644
--- a/src/renderer/components/Sidebar.tsx
+++ b/src/renderer/components/Sidebar.tsx
@@ -1,5 +1,4 @@
 import type { FC } from 'react';
-import { useLocation, useNavigate } from 'react-router-dom';
 
 import {
   BellIcon,
@@ -16,56 +15,24 @@ 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 { quitApp } from '../utils/comms';
-import {
-  openGitHubIssues,
-  openGitHubNotifications,
-  openGitHubPulls,
-} from '../utils/links';
 import { hasActiveFilters } from '../utils/notifications/filters/filter';
 import { LogoIcon } from './icons/LogoIcon';
 
 export const Sidebar: FC = () => {
-  const navigate = useNavigate();
-  const location = useLocation();
-
   const {
-    fetchNotifications,
-    isLoggedIn,
     status,
+    isLoggedIn,
     settings,
-    auth,
     notificationCount,
     hasUnreadNotifications,
-    updateSetting,
   } = useAppContext();
 
-  const primaryAccountHostname = getPrimaryAccountHostname(auth);
-
-  const toggleFilters = () => {
-    if (location.pathname.startsWith('/filters')) {
-      navigate('/', { replace: true });
-    } else {
-      navigate('/filters');
-    }
-  };
-
-  const toggleSettings = () => {
-    if (location.pathname.startsWith('/settings')) {
-      navigate('/', { replace: true });
-      fetchNotifications();
-    } else {
-      navigate('/settings');
-    }
-  };
-
-  const refreshNotifications = () => {
-    navigate('/', { replace: true });
-    fetchNotifications();
-  };
+  const { shortcuts } = useShortcutActions();
+
+  const isLoading = status === 'loading';
 
   return (
     <Stack
@@ -84,7 +51,8 @@ export const Sidebar: FC = () => {
           data-testid="sidebar-home"
           description="Home"
           icon={LogoIcon}
-          onClick={() => navigate('/', { replace: true })}
+          keybindingHint={shortcuts.home.key}
+          onClick={() => shortcuts.home.action()}
           size="small"
           tooltipDirection="e"
           variant="invisible"
@@ -95,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'}
@@ -112,9 +81,8 @@ export const Sidebar: FC = () => {
                   : 'Participating and watching'
               }
               icon={settings.participating ? CrosshairsIcon : EyeIcon}
-              onClick={() => {
-                updateSetting('participating', !settings.participating);
-              }}
+              keybindingHint={shortcuts.focusedMode.key}
+              onClick={() => shortcuts.focusedMode.action()}
               size="small"
               tooltipDirection="e"
               variant={settings.participating ? 'primary' : 'invisible'}
@@ -125,7 +93,8 @@ export const Sidebar: FC = () => {
               data-testid="sidebar-filter-notifications"
               description="Filter notifications"
               icon={FilterIcon}
-              onClick={() => toggleFilters()}
+              keybindingHint={shortcuts.filters.key}
+              onClick={() => shortcuts.filters.action()}
               size="small"
               tooltipDirection="e"
               variant={hasActiveFilters(settings) ? 'primary' : 'invisible'}
@@ -137,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"
@@ -147,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"
@@ -167,10 +138,11 @@ export const Sidebar: FC = () => {
               className={status === 'loading' ? 'animate-spin' : ''}
               data-testid="sidebar-refresh"
               description="Refresh notifications"
-              disabled={status === 'loading'}
+              disabled={isLoading}
               icon={SyncIcon}
+              keybindingHint={shortcuts.refresh.key}
               // loading={status === 'loading'}
-              onClick={() => refreshNotifications()}
+              onClick={() => shortcuts.refresh.action()}
               size="small"
               tooltipDirection="e"
               variant="invisible"
@@ -179,8 +151,10 @@ export const Sidebar: FC = () => {
             <IconButton
               aria-label="Settings"
               data-testid="sidebar-settings"
+              description="Settings"
               icon={GearIcon}
-              onClick={() => toggleSettings()}
+              keybindingHint={shortcuts.settings.key}
+              onClick={() => shortcuts.settings.action()}
               size="small"
               tooltipDirection="e"
               variant="invisible"
@@ -193,7 +167,8 @@ export const Sidebar: FC = () => {
             aria-label={`Quit ${APPLICATION.NAME}`}
             data-testid="sidebar-quit"
             icon={XCircleIcon}
-            onClick={() => quitApp()}
+            keybindingHint={shortcuts.quit.key}
+            onClick={() => shortcuts.quit.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 0fea8e075..57a68a8bb 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_ID_"
                 popover="auto"
                 role="tooltip"
               >
-                Home
+                <span
+                  id="_r_ID_"
+                >
+                  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_ID_"
@@ -227,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_"
@@ -266,11 +338,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"
               >
-                Participating and watching
+                <span
+                  id="_r_ID_"
+                >
+                  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_ID_"
@@ -305,11 +413,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"
               >
-                Filter notifications
+                <span
+                  id="_r_ID_"
+                >
+                  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_ID_"
@@ -346,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_"
@@ -383,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
@@ -431,14 +647,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_ID_"
                 popover="auto"
                 role="tooltip"
               >
-                Refresh notifications
+                <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-labelledby="_r_ID_"
+                aria-describedby="_r_ID_"
+                aria-label="Settings"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
@@ -469,10 +722,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"
               >
-                Settings
+                <span
+                  id="_r_ID_"
+                >
+                  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>
@@ -568,11 +858,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"
             >
-              Home
+              <span
+                id="_r_ID_"
+              >
+                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_ID_"
@@ -607,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_"
@@ -646,11 +1008,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"
             >
-              Participating and watching
+              <span
+                id="_r_ID_"
+              >
+                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_ID_"
@@ -685,11 +1083,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"
             >
-              Filter notifications
+              <span
+                id="_r_ID_"
+              >
+                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_ID_"
@@ -726,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_"
@@ -763,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
@@ -811,14 +1317,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_ID_"
               popover="auto"
               role="tooltip"
             >
-              Refresh notifications
+              <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-labelledby="_r_ID_"
+              aria-describedby="_r_ID_"
+              aria-label="Settings"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
@@ -849,10 +1392,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"
             >
-              Settings
+              <span
+                id="_r_ID_"
+              >
+                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>
@@ -1005,11 +1585,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"
               >
-                Home
+                <span
+                  id="_r_ID_"
+                >
+                  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_ID_"
@@ -1044,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_"
@@ -1085,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_"
@@ -1122,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
@@ -1169,10 +1893,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>
@@ -1268,11 +2028,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"
             >
-              Home
+              <span
+                id="_r_ID_"
+              >
+                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_ID_"
@@ -1307,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_"
@@ -1348,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_"
@@ -1385,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
@@ -1432,10 +2336,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/filters/FilterSection.tsx b/src/renderer/components/filters/FilterSection.tsx
index 707b0bae3..c870f3a90 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 { Checkbox } from '../fields/Checkbox';
 import { Title } from '../primitives/Title';
diff --git a/src/renderer/components/filters/SearchFilter.tsx b/src/renderer/components/filters/SearchFilter.tsx
index 3dfbfd2d0..0ec054b3c 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 { Title } from '../primitives/Title';
 
diff --git a/src/renderer/components/filters/SearchFilterSuggestions.tsx b/src/renderer/components/filters/SearchFilterSuggestions.tsx
index 988d51218..0744d4b57 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';
 
diff --git a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
index 0236d5a93..254d0fa97 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_ID_"
                   popover="auto"
                   role="tooltip"
                 >
-                  Home
+                  <span
+                    id="_r_ID_"
+                  >
+                    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_ID_"
@@ -141,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_"
@@ -180,11 +252,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"
                 >
-                  Participating and watching
+                  <span
+                    id="_r_ID_"
+                  >
+                    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_ID_"
@@ -219,11 +327,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"
                 >
-                  Filter notifications
+                  <span
+                    id="_r_ID_"
+                  >
+                    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_ID_"
@@ -260,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_"
@@ -297,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
@@ -345,14 +561,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_ID_"
                   popover="auto"
                   role="tooltip"
                 >
-                  Refresh notifications
+                  <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-labelledby="_r_ID_"
+                  aria-describedby="_r_ID_"
+                  aria-label="Settings"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
                   data-loading="false"
@@ -383,10 +636,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"
                 >
-                  Settings
+                  <span
+                    id="_r_ID_"
+                  >
+                    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>
@@ -498,11 +788,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"
               >
-                Home
+                <span
+                  id="_r_ID_"
+                >
+                  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_ID_"
@@ -537,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_"
@@ -576,11 +938,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"
               >
-                Participating and watching
+                <span
+                  id="_r_ID_"
+                >
+                  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_ID_"
@@ -615,11 +1013,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"
               >
-                Filter notifications
+                <span
+                  id="_r_ID_"
+                >
+                  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_ID_"
@@ -656,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_"
@@ -693,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
@@ -741,14 +1247,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_ID_"
                 popover="auto"
                 role="tooltip"
               >
-                Refresh notifications
+                <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-labelledby="_r_ID_"
+                aria-describedby="_r_ID_"
+                aria-label="Settings"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
@@ -779,10 +1322,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"
               >
-                Settings
+                <span
+                  id="_r_ID_"
+                >
+                  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>
diff --git a/src/renderer/components/metrics/MetricGroup.tsx b/src/renderer/components/metrics/MetricGroup.tsx
index be9f75bbf..07604974c 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';
 
diff --git a/src/renderer/components/notifications/AccountNotifications.tsx b/src/renderer/components/notifications/AccountNotifications.tsx
index 4a43444a2..99f80b00d 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 { HoverButton } from '../primitives/HoverButton';
 import { HoverGroup } from '../primitives/HoverGroup';
diff --git a/src/renderer/components/notifications/NotificationHeader.tsx b/src/renderer/components/notifications/NotificationHeader.tsx
index d1683539d..d3a3d0c85 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';
 
diff --git a/src/renderer/components/notifications/NotificationRow.tsx b/src/renderer/components/notifications/NotificationRow.tsx
index de7cc63ce..cc2139206 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 { HoverButton } from '../primitives/HoverButton';
 import { HoverGroup } from '../primitives/HoverGroup';
@@ -33,6 +33,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 b4c8181f7..a933dcbbb 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 { HoverButton } from '../primitives/HoverButton';
 import { HoverGroup } from '../primitives/HoverGroup';
@@ -29,6 +29,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 d3b6205b3..b3d940587 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';
 
diff --git a/src/renderer/components/settings/AppearanceSettings.tsx b/src/renderer/components/settings/AppearanceSettings.tsx
index 259df218f..826c2a82e 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 { Checkbox } from '../fields/Checkbox';
 import { FieldLabel } from '../fields/FieldLabel';
@@ -35,6 +35,7 @@ import {
 
 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 94c352e13..25a180a54 100644
--- a/src/renderer/components/settings/NotificationSettings.tsx
+++ b/src/renderer/components/settings/NotificationSettings.tsx
@@ -20,7 +20,7 @@ import { APPLICATION } from '../../../shared/constants';
 
 import { Constants } from '../../constants';
 
-import { useAppContext } from '../../context/App';
+import { useAppContext } from '../../hooks/useAppContext';
 
 import { Checkbox } from '../fields/Checkbox';
 import { FieldLabel } from '../fields/FieldLabel';
@@ -33,6 +33,7 @@ import { openGitHubParticipatingDocs } from '../../utils/links';
 
 export const NotificationSettings: FC = () => {
   const { settings, updateSetting } = useAppContext();
+
   const [fetchInterval, setFetchInterval] = useState<number>(
     settings.fetchInterval,
   );
diff --git a/src/renderer/components/settings/SettingsFooter.test.tsx b/src/renderer/components/settings/SettingsFooter.test.tsx
index 505ca8b8f..e5d0fd77d 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';
 
@@ -16,7 +17,6 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
   let originalEnv: NodeJS.ProcessEnv;
 
   beforeEach(() => {
-    // Save the original node env state
     originalEnv = process.env;
   });
 
@@ -27,7 +27,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();
@@ -39,7 +43,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'));
@@ -52,7 +60,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'));
@@ -64,7 +76,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 d481432c4..34399b9a3 100644
--- a/src/renderer/components/settings/SettingsFooter.tsx
+++ b/src/renderer/components/settings/SettingsFooter.tsx
@@ -1,19 +1,20 @@
 import { type FC, useEffect, useState } from 'react';
-import { 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 { useShortcutActions } from '../../hooks/useShortcutActions';
+
 import { Footer } from '../primitives/Footer';
 
-import { getAppVersion, quitApp } from '../../utils/comms';
+import { getAppVersion } from '../../utils/comms';
 import { openGitifyReleaseNotes } from '../../utils/links';
 
 export const SettingsFooter: FC = () => {
   const [appVersion, setAppVersion] = useState<string | null>(null);
-  const navigate = useNavigate();
+  const { shortcuts } = useShortcutActions();
 
   useEffect(() => {
     (async () => {
@@ -35,28 +36,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={shortcuts.accounts.key}
+          onClick={() => {
+            shortcuts.accounts.action();
+          }}
+          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={shortcuts.quit.key}
+          onClick={() => {
+            shortcuts.quit.action();
+          }}
+          tooltipDirection="nw"
+          variant="danger"
+        />
       </Stack>
     </Footer>
   );
diff --git a/src/renderer/components/settings/SettingsReset.tsx b/src/renderer/components/settings/SettingsReset.tsx
index 88fd65385..7b040edad 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';
 
diff --git a/src/renderer/components/settings/SystemSettings.tsx b/src/renderer/components/settings/SystemSettings.tsx
index 26f0e9e4c..17a2f49b7 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 { Checkbox } from '../fields/Checkbox';
 import { RadioGroup } from '../fields/RadioGroup';
diff --git a/src/renderer/components/settings/TraySettings.tsx b/src/renderer/components/settings/TraySettings.tsx
index 7a4ccd4ed..51216ae30 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 341fdb082..4d68cfd5c 100644
--- a/src/renderer/context/App.test.tsx
+++ b/src/renderer/context/App.test.tsx
@@ -1,5 +1,4 @@
 import { act, fireEvent, waitFor } from '@testing-library/react';
-import { useContext } from 'react';
 
 import { renderWithAppContext } from '../__helpers__/test-utils';
 import { mockGitifyNotification } from '../__mocks__/notifications-mocks';
@@ -7,6 +6,7 @@ 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';
@@ -15,7 +15,7 @@ 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');
@@ -26,7 +26,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 178ae3c7f..2ef6b33db 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,
@@ -118,18 +117,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
new file mode 100644
index 000000000..758ee68f1
--- /dev/null
+++ b/src/renderer/hooks/useShortcutActions.ts
@@ -0,0 +1,142 @@
+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'
+  | 'accounts';
+
+type ShortcutConfig = {
+  /** Shortcut key */
+  key: string;
+  /** If the shortcut key is enabled */
+  isAllowed: boolean;
+  /** Action the shortcut key should take */
+  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(): { shortcuts: ShortcutConfigs } {
+  const navigate = useNavigate();
+  const location = useLocation();
+
+  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: {
+        key: 'h',
+        isAllowed: true,
+        action: () => navigate('/', { replace: true }),
+      },
+      myNotifications: {
+        key: 'n',
+        isAllowed: isLoggedIn,
+        action: () => openGitHubNotifications(primaryAccountHostname),
+      },
+      focusedMode: {
+        key: 'w',
+        isAllowed: isLoggedIn && !isLoading,
+        action: () => updateSetting('participating', !settings.participating),
+      },
+      filters: {
+        key: 'f',
+        isAllowed: isLoggedIn,
+        action: () => {
+          if (isOnFiltersRoute) {
+            navigate('/', { replace: true });
+          } else {
+            navigate('/filters');
+          }
+        },
+      },
+      myIssues: {
+        key: 'i',
+        isAllowed: isLoggedIn,
+        action: () => openGitHubIssues(primaryAccountHostname),
+      },
+      myPullRequests: {
+        key: 'p',
+        isAllowed: isLoggedIn,
+        action: () => openGitHubPulls(primaryAccountHostname),
+      },
+      refresh: {
+        key: 'r',
+        isAllowed: !isLoading,
+        action: () => {
+          if (isLoading) {
+            return;
+          }
+          navigate('/', { replace: true });
+          void fetchNotifications();
+        },
+      },
+      settings: {
+        key: 's',
+        isAllowed: isLoggedIn,
+        action: () => {
+          if (isOnSettingsRoute) {
+            navigate('/', { replace: true });
+            void fetchNotifications();
+          } else {
+            navigate('/settings');
+          }
+        },
+      },
+      accounts: {
+        key: 'a',
+        isAllowed: isLoggedIn && isOnSettingsRoute,
+        action: () => navigate('/accounts'),
+      },
+      quit: {
+        key: 'q',
+        isAllowed: !isLoggedIn || isOnSettingsRoute,
+        action: () => quitApp(),
+      },
+    };
+  }, [
+    settings.participating,
+    isLoggedIn,
+    isLoading,
+    isOnFiltersRoute,
+    isOnSettingsRoute,
+    fetchNotifications,
+    updateSetting,
+  ]);
+
+  return { shortcuts };
+}
diff --git a/src/renderer/routes/Accounts.tsx b/src/renderer/routes/Accounts.tsx
index 73e16f4b5..73277cc10 100644
--- a/src/renderer/routes/Accounts.tsx
+++ b/src/renderer/routes/Accounts.tsx
@@ -21,7 +21,7 @@ import {
   Text,
 } from '@primer/react';
 
-import { useAppContext } from '../context/App';
+import { useAppContext } from '../hooks/useAppContext';
 
 import { AvatarWithFallback } from '../components/avatars/AvatarWithFallback';
 import { Contents } from '../components/layout/Contents';
@@ -47,9 +47,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 9fd1cada5..5ba2d6208 100644
--- a/src/renderer/routes/Filters.tsx
+++ b/src/renderer/routes/Filters.tsx
@@ -3,7 +3,7 @@ import type { FC } from 'react';
 import { FilterIcon, FilterRemoveIcon } from '@primer/octicons-react';
 import { Button, Stack, Tooltip } from '@primer/react';
 
-import { useAppContext } from '../context/App';
+import { useAppContext } from '../hooks/useAppContext';
 
 import { ReasonFilter } from '../components/filters/ReasonFilter';
 import { SearchFilter } from '../components/filters/SearchFilter';
diff --git a/src/renderer/routes/Login.tsx b/src/renderer/routes/Login.tsx
index d53d387c4..c8dbffda6 100644
--- a/src/renderer/routes/Login.tsx
+++ b/src/renderer/routes/Login.tsx
@@ -4,7 +4,7 @@ import { useNavigate } from 'react-router-dom';
 import { KeyIcon, MarkGithubIcon, PersonIcon } from '@primer/octicons-react';
 import { Button, Heading, Stack, Text } from '@primer/react';
 
-import { useAppContext } from '../context/App';
+import { useAppContext } from '../hooks/useAppContext';
 
 import { LogoIcon } from '../components/icons/LogoIcon';
 import { Centered } from '../components/layout/Centered';
@@ -16,6 +16,7 @@ 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 2398f0edb..ac5674194 100644
--- a/src/renderer/routes/LoginWithOAuthApp.tsx
+++ b/src/renderer/routes/LoginWithOAuthApp.tsx
@@ -20,7 +20,7 @@ import {
 
 import { Constants } from '../constants';
 
-import { useAppContext } from '../context/App';
+import { useAppContext } from '../hooks/useAppContext';
 
 import { Contents } from '../components/layout/Contents';
 import { Page } from '../components/layout/Page';
diff --git a/src/renderer/routes/LoginWithPersonalAccessToken.tsx b/src/renderer/routes/LoginWithPersonalAccessToken.tsx
index 2cda13ff1..2a2d8dddd 100644
--- a/src/renderer/routes/LoginWithPersonalAccessToken.tsx
+++ b/src/renderer/routes/LoginWithPersonalAccessToken.tsx
@@ -20,7 +20,7 @@ import {
 
 import { Constants } from '../constants';
 
-import { useAppContext } from '../context/App';
+import { useAppContext } from '../hooks/useAppContext';
 
 import { Contents } from '../components/layout/Contents';
 import { Page } from '../components/layout/Page';
diff --git a/src/renderer/routes/Notifications.tsx b/src/renderer/routes/Notifications.tsx
index 95c20c027..fcc24329b 100644
--- a/src/renderer/routes/Notifications.tsx
+++ b/src/renderer/routes/Notifications.tsx
@@ -1,6 +1,6 @@
 import { type FC, useMemo } from 'react';
 
-import { useAppContext } from '../context/App';
+import { useAppContext } from '../hooks/useAppContext';
 
 import { AllRead } from '../components/AllRead';
 import { Contents } from '../components/layout/Contents';
diff --git a/src/renderer/routes/Settings.test.tsx b/src/renderer/routes/Settings.test.tsx
index 1077a5973..acc0cbf14 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';
 
@@ -20,7 +21,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();
@@ -28,9 +33,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>