diff --git a/src/components/ConsoleOAuthFlow.tsx b/src/components/ConsoleOAuthFlow.tsx
index 90a2e2b36..a9782fa5c 100644
--- a/src/components/ConsoleOAuthFlow.tsx
+++ b/src/components/ConsoleOAuthFlow.tsx
@@ -689,11 +689,12 @@ function OAuthStatusMessage({
 
         const handleEnter = useCallback(() => {
           const idx = FIELDS.indexOf(activeField)
-          setOAuthStatus(buildState(activeField, inputValue))
           if (idx === FIELDS.length - 1) {
+            setOAuthStatus(buildState(activeField, inputValue))
             doSave()
           } else {
             const next = FIELDS[idx + 1]!
+            setOAuthStatus(buildState(activeField, inputValue, next))
             setInputValue(displayValues[next] ?? '')
             setInputCursorOffset((displayValues[next] ?? '').length)
           }
@@ -885,11 +886,12 @@ function OAuthStatusMessage({
 
         const handleOpenAIEnter = useCallback(() => {
           const idx = OPENAI_FIELDS.indexOf(activeField)
-          setOAuthStatus(buildOpenAIState(activeField, openaiInputValue))
           if (idx === OPENAI_FIELDS.length - 1) {
+            setOAuthStatus(buildOpenAIState(activeField, openaiInputValue))
             doOpenAISave()
           } else {
             const next = OPENAI_FIELDS[idx + 1]!
+            setOAuthStatus(buildOpenAIState(activeField, openaiInputValue, next))
             setOpenaiInputValue(openaiDisplayValues[next] ?? '')
             setOpenaiInputCursorOffset((openaiDisplayValues[next] ?? '').length)
           }
@@ -1117,11 +1119,12 @@ function OAuthStatusMessage({
 
         const handleGeminiEnter = useCallback(() => {
           const idx = GEMINI_FIELDS.indexOf(activeField)
-          setOAuthStatus(buildGeminiState(activeField, geminiInputValue))
           if (idx === GEMINI_FIELDS.length - 1) {
+            setOAuthStatus(buildGeminiState(activeField, geminiInputValue))
             doGeminiSave()
           } else {
             const next = GEMINI_FIELDS[idx + 1]!
+            setOAuthStatus(buildGeminiState(activeField, geminiInputValue, next))
             setGeminiInputValue(geminiDisplayValues[next] ?? '')
             setGeminiInputCursorOffset((geminiDisplayValues[next] ?? '').length)
           }