diff --git a/packages/app/src/components/shortcuts-panel.tsx b/packages/app/src/components/shortcuts-panel.tsx
index 09e17bde63..5e8d3786b7 100644
--- a/packages/app/src/components/shortcuts-panel.tsx
+++ b/packages/app/src/components/shortcuts-panel.tsx
@@ -185,18 +185,23 @@ function ShortcutItem(props: { shortcut: Shortcut }) {
 
 export function ShortcutsPanel(props: { onClose: () => void }) {
   const [activeTab, setActiveTab] = createSignal(SHORTCUT_CATEGORIES[0].name)
+  let listRef: HTMLDivElement | undefined
 
   onMount(() => {
     const handler = () => setUsedShortcuts(getUsedShortcuts())
     window.addEventListener("shortcut-used", handler)
     onCleanup(() => window.removeEventListener("shortcut-used", handler))
+
+    // Focus the active tab trigger so arrow keys work immediately
+    const trigger = listRef?.querySelector<HTMLButtonElement>('[data-slot="tabs-trigger"][data-selected]')
+    trigger?.focus()
   })
 
   return (
     <div class="shortcuts-panel" data-component="shortcuts-panel">
       <Tabs value={activeTab()} onChange={setActiveTab}>
         <div class="shortcuts-tabs-row">
-          <Tabs.List class="shortcuts-tabs-list">
+          <Tabs.List ref={listRef} class="shortcuts-tabs-list">
             <For each={SHORTCUT_CATEGORIES}>
               {(category) => <Tabs.Trigger value={category.name}>{category.name}</Tabs.Trigger>}
             </For>
diff --git a/packages/app/src/index.css b/packages/app/src/index.css
index e7b207a58f..febb67576f 100644
--- a/packages/app/src/index.css
+++ b/packages/app/src/index.css
@@ -80,6 +80,7 @@
   height: auto;
   justify-content: center;
   gap: 24px;
+  padding: 4px;
 }
 
 .shortcuts-panel [data-slot="tabs-list"]::after {
@@ -105,6 +106,12 @@
 
 .shortcuts-panel [data-slot="tabs-trigger"] {
   padding: 4px 12px;
+  border-radius: 6px;
+}
+
+.shortcuts-panel [data-slot="tabs-trigger"]:focus-visible {
+  outline: none;
+  box-shadow: var(--shadow-xs-border-focus);
 }
 
 .shortcuts-panel [data-slot="tabs-content"] {