diff --git a/src/components/ConsoleOAuthFlow.tsx b/src/components/ConsoleOAuthFlow.tsx
index 44c69025f..90a2e2b36 100644
--- a/src/components/ConsoleOAuthFlow.tsx
+++ b/src/components/ConsoleOAuthFlow.tsx
@@ -709,7 +709,7 @@ function OAuthStatusMessage({
               setInputCursorOffset((displayValues[FIELDS[idx + 1]!] ?? '').length)
             }
           },
-          { context: 'Tabs' },
+          { context: 'FormField' },
         )
         useKeybinding(
           'tabs:previous',
@@ -721,7 +721,7 @@ function OAuthStatusMessage({
               setInputCursorOffset((displayValues[FIELDS[idx - 1]!] ?? '').length)
             }
           },
-          { context: 'Tabs' },
+          { context: 'FormField' },
         )
         useKeybinding(
           'confirm:no',
@@ -782,7 +782,7 @@ function OAuthStatusMessage({
               {renderRow('opus_model', 'Opus     ')}
             </Box>
             <Text dimColor>
-              Tab to switch · Enter on last field to save · Esc to go back
+              ↑↓/Tab to switch · Enter on last field to save · Esc to go back
             </Text>
           </Box>
         )
@@ -916,7 +916,7 @@ function OAuthStatusMessage({
               )
             }
           },
-          { context: 'Tabs' },
+          { context: 'FormField' },
         )
         useKeybinding(
           'tabs:previous',
@@ -932,7 +932,7 @@ function OAuthStatusMessage({
               )
             }
           },
-          { context: 'Tabs' },
+          { context: 'FormField' },
         )
         useKeybinding(
           'confirm:no',
@@ -997,7 +997,7 @@ function OAuthStatusMessage({
               {renderOpenAIRow('opus_model', 'Opus     ')}
             </Box>
             <Text dimColor>
-              Tab to switch · Enter on last field to save · Esc to go back
+              ↑↓/Tab to switch · Enter on last field to save · Esc to go back
             </Text>
           </Box>
         )
@@ -1148,7 +1148,7 @@ function OAuthStatusMessage({
               )
             }
           },
-          { context: 'Tabs' },
+          { context: 'FormField' },
         )
         useKeybinding(
           'tabs:previous',
@@ -1164,7 +1164,7 @@ function OAuthStatusMessage({
               )
             }
           },
-          { context: 'Tabs' },
+          { context: 'FormField' },
         )
         useKeybinding(
           'confirm:no',
@@ -1229,7 +1229,7 @@ function OAuthStatusMessage({
               {renderGeminiRow('opus_model', 'Opus     ')}
             </Box>
             <Text dimColor>
-              Tab to switch · Enter on last field to save · Esc to go back
+              ↑↓/Tab to switch · Enter on last field to save · Esc to go back
             </Text>
           </Box>
         )
diff --git a/src/keybindings/defaultBindings.ts b/src/keybindings/defaultBindings.ts
index 8629809d9..f33e764ac 100644
--- a/src/keybindings/defaultBindings.ts
+++ b/src/keybindings/defaultBindings.ts
@@ -147,6 +147,16 @@ export const DEFAULT_BINDINGS: KeybindingBlock[] = [
       'ctrl+d': 'permission:toggleDebug',
     },
   },
+  {
+    context: 'FormField',
+    bindings: {
+      // Form field vertical navigation (login/setup panels)
+      tab: 'tabs:next',
+      'shift+tab': 'tabs:previous',
+      up: 'tabs:previous',
+      down: 'tabs:next',
+    },
+  },
   {
     context: 'Tabs',
     bindings: {