diff --git a/src/commands/auth-choice.apply.openai.ts b/src/commands/auth-choice.apply.openai.ts
index b7b38afff23..b71a20c4fd4 100644
--- a/src/commands/auth-choice.apply.openai.ts
+++ b/src/commands/auth-choice.apply.openai.ts
@@ -42,6 +42,22 @@ export async function applyAuthChoiceOpenAI(
       );
     };
 
+    const applyOpenAiDefaultModelChoice = async (): Promise<ApplyAuthChoiceResult> => {
+      const applied = await applyDefaultModelChoice({
+        config: nextConfig,
+        setDefaultModel: params.setDefaultModel,
+        defaultModel: OPENAI_DEFAULT_MODEL,
+        applyDefaultConfig: applyOpenAIConfig,
+        applyProviderConfig: applyOpenAIProviderConfig,
+        noteDefault: OPENAI_DEFAULT_MODEL,
+        noteAgentModel,
+        prompter: params.prompter,
+      });
+      nextConfig = applied.config;
+      agentModelOverride = applied.agentModelOverride ?? agentModelOverride;
+      return { config: nextConfig, agentModelOverride };
+    };
+
     const envKey = resolveEnvApiKey("openai");
     if (envKey) {
       const useExisting = await params.prompter.confirm({
@@ -60,19 +76,7 @@ export async function applyAuthChoiceOpenAI(
           `Copied OPENAI_API_KEY to ${result.path} for launchd compatibility.`,
           "OpenAI API key",
         );
-        const applied = await applyDefaultModelChoice({
-          config: nextConfig,
-          setDefaultModel: params.setDefaultModel,
-          defaultModel: OPENAI_DEFAULT_MODEL,
-          applyDefaultConfig: applyOpenAIConfig,
-          applyProviderConfig: applyOpenAIProviderConfig,
-          noteDefault: OPENAI_DEFAULT_MODEL,
-          noteAgentModel,
-          prompter: params.prompter,
-        });
-        nextConfig = applied.config;
-        agentModelOverride = applied.agentModelOverride ?? agentModelOverride;
-        return { config: nextConfig, agentModelOverride };
+        return await applyOpenAiDefaultModelChoice();
       }
     }
 
@@ -96,19 +100,7 @@ export async function applyAuthChoiceOpenAI(
       `Saved OPENAI_API_KEY to ${result.path} for launchd compatibility.`,
       "OpenAI API key",
     );
-    const applied = await applyDefaultModelChoice({
-      config: nextConfig,
-      setDefaultModel: params.setDefaultModel,
-      defaultModel: OPENAI_DEFAULT_MODEL,
-      applyDefaultConfig: applyOpenAIConfig,
-      applyProviderConfig: applyOpenAIProviderConfig,
-      noteDefault: OPENAI_DEFAULT_MODEL,
-      noteAgentModel,
-      prompter: params.prompter,
-    });
-    nextConfig = applied.config;
-    agentModelOverride = applied.agentModelOverride ?? agentModelOverride;
-    return { config: nextConfig, agentModelOverride };
+    return await applyOpenAiDefaultModelChoice();
   }
 
   if (params.authChoice === "openai-codex") {