diff --git a/app/src/components/views/settings-view.tsx b/app/src/components/views/settings-view.tsx
index e399c09f..9ec2b447 100644
--- a/app/src/components/views/settings-view.tsx
+++ b/app/src/components/views/settings-view.tsx
@@ -1422,9 +1422,9 @@ export function SettingsView() {
                                     setShortcutError(null);
                                   }
                                 }}
-                                className="w-20 h-8 text-center font-mono"
+                                className="w-24 h-8 text-center font-mono"
                                 placeholder="Key"
-                                maxLength={1}
+                                maxLength={2}
                                 autoFocus
                                 data-testid={`edit-shortcut-${key}`}
                               />
@@ -1534,9 +1534,9 @@ export function SettingsView() {
                                     setShortcutError(null);
                                   }
                                 }}
-                                className="w-20 h-8 text-center font-mono"
+                                className="w-24 h-8 text-center font-mono"
                                 placeholder="Key"
-                                maxLength={1}
+                                maxLength={2}
                                 autoFocus
                                 data-testid={`edit-shortcut-${key}`}
                               />
@@ -1649,9 +1649,9 @@ export function SettingsView() {
                                     setShortcutError(null);
                                   }
                                 }}
-                                className="w-20 h-8 text-center font-mono"
+                                className="w-24 h-8 text-center font-mono"
                                 placeholder="Key"
-                                maxLength={1}
+                                maxLength={2}
                                 autoFocus
                                 data-testid={`edit-shortcut-${key}`}
                               />
diff --git a/app/src/store/app-store.ts b/app/src/store/app-store.ts
index 77779ecb..7c9ced56 100644
--- a/app/src/store/app-store.ts
+++ b/app/src/store/app-store.ts
@@ -78,15 +78,17 @@ export const DEFAULT_KEYBOARD_SHORTCUTS: KeyboardShortcuts = {
   toggleSidebar: "`",
   
   // Actions
-  addFeature: "N",
-  addContextFile: "F",
-  startNext: "G",
-  newSession: "N",
-  openProject: "O",
-  projectPicker: "P",
-  cyclePrevProject: "Q",
-  cycleNextProject: "E",
-  addProfile: "N",
+  // Note: Some shortcuts share the same key (e.g., "N" for addFeature, newSession, addProfile)
+  // This is intentional as they are context-specific and only active in their respective views
+  addFeature: "N",        // Only active in board view
+  addContextFile: "F",    // Only active in context view
+  startNext: "G",         // Only active in board view
+  newSession: "N",        // Only active in agent view
+  openProject: "O",       // Global shortcut
+  projectPicker: "P",     // Global shortcut
+  cyclePrevProject: "Q",  // Global shortcut
+  cycleNextProject: "E",  // Global shortcut
+  addProfile: "N",        // Only active in profiles view
 };
 
 export interface ImageAttachment {