From 2f22c3950a39eb517c68660f3316f9d1c99999a1 Mon Sep 17 00:00:00 2001
From: richardkeep <r.kipsang@gmail.com>
Date: Sat, 31 Oct 2026 23:56:29 +0300
Subject: [PATCH 1/3] feat: collapse the sidebar with cmd/ctrl+b

---
 KNOWLEDGE_BASE.md                             |  1 +
 resources/js/components/app-nav.tsx           | 11 ++++++---
 .../components/keyboard-shortcuts-dialog.tsx  |  4 ++++
 resources/js/hooks/use-keyboard-shortcuts.ts  | 24 +++++++++++++++++++
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/KNOWLEDGE_BASE.md b/KNOWLEDGE_BASE.md
index 60159b584..e8bd9e11e 100644
--- a/KNOWLEDGE_BASE.md
+++ b/KNOWLEDGE_BASE.md
@@ -503,6 +503,7 @@ Press **?** to open the shortcut reference. Navigation shortcuts work outside te
 | `s` | Star or unstar the focused commit. |
 | `c` | Write a commit. |
 | `⌘/Ctrl+K` or `/` | Search developers and commits. |
+| `⌘/Ctrl+B` | Collapse or expand the sidebar on wide screens. |
 | `⌘/Ctrl+Enter` | Submit from the composer. |
 | `⌘/Ctrl+Shift+P` | Toggle composer preview. |
 | `g` then `l` / `e` / `p` / `s` / `n` / `m` / `*` | Go to your log / Trending / profile / settings / Notifications / Remotes / Starred. `g m` works only while Remotes is on. |
diff --git a/resources/js/components/app-nav.tsx b/resources/js/components/app-nav.tsx
index 37d44786b..2ca38f32c 100644
--- a/resources/js/components/app-nav.tsx
+++ b/resources/js/components/app-nav.tsx
@@ -377,7 +377,11 @@ export function AppNav({
                 </NavTooltip>
                 <NavTooltip
                     label={
-                        iconsOnly ? (sidebarOpen ? 'Collapse' : 'Expand') : null
+                        iconsOnly
+                            ? sidebarOpen
+                                ? `Collapse (${keys.combo(keys.mod, 'B')})`
+                                : `Expand (${keys.combo(keys.mod, 'B')})`
+                            : null
                     }
                 >
                     <button
@@ -389,12 +393,13 @@ export function AppNav({
                                 : 'Expand navigation'
                         }
                         aria-expanded={sidebarOpen}
+                        aria-keyshortcuts="Control+B Meta+B"
                         title={
                             iconsOnly
                                 ? undefined
                                 : sidebarOpen
-                                  ? 'Collapse navigation'
-                                  : 'Expand navigation'
+                                  ? `Collapse navigation (${keys.combo(keys.mod, 'B')})`
+                                  : `Expand navigation (${keys.combo(keys.mod, 'B')})`
                         }
                         className="hidden h-11 items-center gap-3 rounded-lg py-3 pr-3 pl-4 text-[15px] leading-5 font-medium text-muted-foreground transition-colors hover:bg-accent hover:text-foreground lg:flex"
                         data-test="nav-collapse-button"
diff --git a/resources/js/components/keyboard-shortcuts-dialog.tsx b/resources/js/components/keyboard-shortcuts-dialog.tsx
index c4fb9ec01..654194170 100644
--- a/resources/js/components/keyboard-shortcuts-dialog.tsx
+++ b/resources/js/components/keyboard-shortcuts-dialog.tsx
@@ -61,6 +61,10 @@ const groups = (
             title: 'Anywhere',
             shortcuts: [
                 { keys: [[keys.mod, 'K'], ['/']], label: 'Search' },
+                {
+                    keys: [[keys.mod, 'B']],
+                    label: 'Collapse or expand sidebar',
+                },
                 { keys: [['?']], label: 'Show this list' },
             ],
         },
diff --git a/resources/js/hooks/use-keyboard-shortcuts.ts b/resources/js/hooks/use-keyboard-shortcuts.ts
index de9be7a96..c5d516c45 100644
--- a/resources/js/hooks/use-keyboard-shortcuts.ts
+++ b/resources/js/hooks/use-keyboard-shortcuts.ts
@@ -60,6 +60,19 @@ function focusedCommitAction(key: string): HTMLButtonElement | null {
     return action && !action.closest('[inert]') ? action : null;
 }
 
+/**
+ * The collapse button only shows where the nav can widen, so the shortcut does nothing where it is hidden.
+ */
+function toggleNav(): void {
+    const toggle = document.querySelector<HTMLButtonElement>(
+        'button[aria-keyshortcuts~="Meta+B"]',
+    );
+
+    if (toggle?.checkVisibility()) {
+        toggle.click();
+    }
+}
+
 function openFocusedCommit(): boolean {
     const commit = document.activeElement;
 
@@ -121,6 +134,17 @@ export function useKeyboardShortcuts(
                 return;
             }
 
+            if (
+                hasModKey(event) &&
+                event.key.toLowerCase() === 'b' &&
+                !isTyping(event.target)
+            ) {
+                event.preventDefault();
+                toggleNav();
+
+                return;
+            }
+
             if (
                 event.defaultPrevented ||
                 event.metaKey ||

From 38429f363a103d3d7c1198674a2480076ba032b5 Mon Sep 17 00:00:00 2001
From: richardkeep <r.kipsang@gmail.com>
Date: Sat, 31 Oct 2026 23:58:33 +0300
Subject: [PATCH 2/3] fix: leave cmd/ctrl+b alone where the sidebar cannot
 toggle

---
 resources/js/components/app-nav.tsx          |  9 +++--
 resources/js/hooks/use-keyboard-shortcuts.ts | 40 ++++++++++++--------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/resources/js/components/app-nav.tsx b/resources/js/components/app-nav.tsx
index 2ca38f32c..1d71ff0ec 100644
--- a/resources/js/components/app-nav.tsx
+++ b/resources/js/components/app-nav.tsx
@@ -275,6 +275,7 @@ export function AppNav({
     const { isNavOpen: sidebarOpen, isLayoutOpen, setNavOpen } = useNavOpen();
     const items = useNavItems();
     const keys = useKeyLabels();
+    const collapseShortcut = keys.combo(keys.mod, 'B');
 
     const iconsOnly = !(useMediaQuery('(min-width: 64rem)') && isLayoutOpen);
 
@@ -379,8 +380,8 @@ export function AppNav({
                     label={
                         iconsOnly
                             ? sidebarOpen
-                                ? `Collapse (${keys.combo(keys.mod, 'B')})`
-                                : `Expand (${keys.combo(keys.mod, 'B')})`
+                                ? `Collapse (${collapseShortcut})`
+                                : `Expand (${collapseShortcut})`
                             : null
                     }
                 >
@@ -398,8 +399,8 @@ export function AppNav({
                             iconsOnly
                                 ? undefined
                                 : sidebarOpen
-                                  ? `Collapse navigation (${keys.combo(keys.mod, 'B')})`
-                                  : `Expand navigation (${keys.combo(keys.mod, 'B')})`
+                                  ? `Collapse navigation (${collapseShortcut})`
+                                  : `Expand navigation (${collapseShortcut})`
                         }
                         className="hidden h-11 items-center gap-3 rounded-lg py-3 pr-3 pl-4 text-[15px] leading-5 font-medium text-muted-foreground transition-colors hover:bg-accent hover:text-foreground lg:flex"
                         data-test="nav-collapse-button"
diff --git a/resources/js/hooks/use-keyboard-shortcuts.ts b/resources/js/hooks/use-keyboard-shortcuts.ts
index c5d516c45..e8ba73cb6 100644
--- a/resources/js/hooks/use-keyboard-shortcuts.ts
+++ b/resources/js/hooks/use-keyboard-shortcuts.ts
@@ -63,14 +63,18 @@ function focusedCommitAction(key: string): HTMLButtonElement | null {
 /**
  * The collapse button only shows where the nav can widen, so the shortcut does nothing where it is hidden.
  */
-function toggleNav(): void {
+function toggleNav(): boolean {
     const toggle = document.querySelector<HTMLButtonElement>(
         'button[aria-keyshortcuts~="Meta+B"]',
     );
 
-    if (toggle?.checkVisibility()) {
-        toggle.click();
+    if (!toggle?.checkVisibility()) {
+        return false;
     }
+
+    toggle.click();
+
+    return true;
 }
 
 function openFocusedCommit(): boolean {
@@ -134,27 +138,31 @@ export function useKeyboardShortcuts(
                 return;
             }
 
+            if (
+                event.defaultPrevented ||
+                isTyping(event.target) ||
+                document.querySelector(
+                    '[role="dialog"][data-state="open"], [role="dialog"][aria-modal="true"]',
+                )
+            ) {
+                return;
+            }
+
             if (
                 hasModKey(event) &&
                 event.key.toLowerCase() === 'b' &&
-                !isTyping(event.target)
+                !event.shiftKey &&
+                !event.altKey &&
+                !event.repeat
             ) {
-                event.preventDefault();
-                toggleNav();
+                if (toggleNav()) {
+                    event.preventDefault();
+                }
 
                 return;
             }
 
-            if (
-                event.defaultPrevented ||
-                event.metaKey ||
-                event.ctrlKey ||
-                event.altKey ||
-                isTyping(event.target) ||
-                document.querySelector(
-                    '[role="dialog"][data-state="open"], [role="dialog"][aria-modal="true"]',
-                )
-            ) {
+            if (event.metaKey || event.ctrlKey || event.altKey) {
                 return;
             }
 

From ea8b7c74d568d1cb38fb25f8f3884b84e65c3ca4 Mon Sep 17 00:00:00 2001
From: richardkeep <r.kipsang@gmail.com>
Date: Sun, 1 Nov 2026 15:49:54 +0300
Subject: [PATCH 3/3] Fix CodeRabbit issue

---
 resources/js/hooks/use-keyboard-shortcuts.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/js/hooks/use-keyboard-shortcuts.ts b/resources/js/hooks/use-keyboard-shortcuts.ts
index e8ba73cb6..ca05f5747 100644
--- a/resources/js/hooks/use-keyboard-shortcuts.ts
+++ b/resources/js/hooks/use-keyboard-shortcuts.ts
@@ -150,7 +150,8 @@ export function useKeyboardShortcuts(
 
             if (
                 hasModKey(event) &&
-                event.key.toLowerCase() === 'b' &&
+                (event.key.toLowerCase() === 'b' ||
+                    (event.code === 'KeyB' && !/^[a-z]$/i.test(event.key))) &&
                 !event.shiftKey &&
                 !event.altKey &&
                 !event.repeat