diff --git a/packages/app/src/components/prompt-input/submit.test.ts b/packages/app/src/components/prompt-input/submit.test.ts
index b1b289a27658..daffc139aca9 100644
--- a/packages/app/src/components/prompt-input/submit.test.ts
+++ b/packages/app/src/components/prompt-input/submit.test.ts
@@ -1,7 +1,8 @@
 import { beforeAll, beforeEach, describe, expect, mock, test } from "bun:test"
-import type { Prompt } from "@/context/prompt"
+import type { ContextItem, Prompt } from "@/context/prompt"
 
 let createPromptSubmit: typeof import("./submit").createPromptSubmit
+type FollowupDraft = import("./submit").FollowupDraft
 
 const createdClients: string[] = []
 const createdSessions: string[] = []
@@ -20,10 +21,13 @@ const storedSessions: Record<string, Array<{ id: string; title?: string }>> = {}
 const promoted: Array<{ directory: string; sessionID: string }> = []
 const sentShell: string[] = []
 const syncedDirectories: string[] = []
+const removedContextKeys: string[] = []
 
 let params: { id?: string } = {}
 let selected = "/repo/worktree-a"
 let variant: string | undefined
+let promptContextItems: Array<ContextItem & { key: string }> = []
+let promptResetCount = 0
 
 const promptValue: Prompt = [{ type: "text", content: "ls", start: 0, end: 2 }]
 
@@ -106,12 +110,17 @@ beforeAll(async () => {
   mock.module("@/context/prompt", () => ({
     usePrompt: () => ({
       current: () => promptValue,
-      reset: () => undefined,
+      reset: () => {
+        promptResetCount += 1
+      },
       set: () => undefined,
       context: {
         add: () => undefined,
-        remove: () => undefined,
-        items: () => [],
+        remove: (key: string) => {
+          removedContextKeys.push(key)
+          promptContextItems = promptContextItems.filter((item) => item.key !== key)
+        },
+        items: () => promptContextItems,
       },
     }),
   }))
@@ -211,8 +220,11 @@ beforeEach(() => {
   params = {}
   sentShell.length = 0
   syncedDirectories.length = 0
+  removedContextKeys.length = 0
   selected = "/repo/worktree-a"
   variant = undefined
+  promptContextItems = []
+  promptResetCount = 0
   for (const key of Object.keys(storedSessions)) delete storedSessions[key]
 })
 
@@ -343,3 +355,81 @@ describe("prompt submit worktree selection", () => {
     expect(optimisticSeeded).toEqual([true])
   })
 })
+
+describe("queued followups", () => {
+  test("queues followup drafts instead of sending immediately", async () => {
+    params = { id: "session-1" }
+    variant = "high"
+    promptContextItems = [
+      {
+        key: "context-1",
+        type: "file",
+        path: "src/index.ts",
+        selection: undefined,
+        comment: "Check this",
+        commentID: "comment-1",
+        commentOrigin: "file",
+        preview: "const value = 1",
+      },
+    ]
+
+    const queued: FollowupDraft[] = []
+    const modes: Array<"normal" | "shell"> = []
+    const popovers: Array<"at" | "slash" | null> = []
+    let submitCalls = 0
+
+    const submit = createPromptSubmit({
+      info: () => ({ id: "session-1" }),
+      imageAttachments: () => [],
+      commentCount: () => 1,
+      autoAccept: () => false,
+      mode: () => "normal",
+      working: () => true,
+      editor: () => undefined,
+      queueScroll: () => undefined,
+      promptLength: (value) => value.reduce((sum, part) => sum + ("content" in part ? part.content.length : 0), 0),
+      addToHistory: () => undefined,
+      resetHistoryNavigation: () => undefined,
+      setMode: (mode) => modes.push(mode),
+      setPopover: (popover) => popovers.push(popover),
+      shouldQueue: () => true,
+      onQueue: (draft) => queued.push(draft),
+      onSubmit: () => {
+        submitCalls += 1
+      },
+    })
+
+    const event = { preventDefault: () => undefined } as unknown as Event
+
+    await submit.handleSubmit(event)
+
+    expect(queued).toHaveLength(1)
+    expect(queued[0]).toMatchObject({
+      sessionID: "session-1",
+      sessionDirectory: "/repo/main",
+      prompt: promptValue,
+      context: [
+        {
+          key: "context-1",
+          type: "file",
+          path: "src/index.ts",
+          comment: "Check this",
+          commentID: "comment-1",
+          commentOrigin: "file",
+          preview: "const value = 1",
+        },
+      ],
+      agent: "agent",
+      model: { providerID: "provider", modelID: "model" },
+      variant: "high",
+    })
+    expect(promptResetCount).toBe(1)
+    expect(promptContextItems).toEqual([])
+    expect(removedContextKeys).toEqual(["context-1"])
+    expect(modes).toEqual(["normal"])
+    expect(popovers).toEqual([null])
+    expect(submitCalls).toBe(0)
+    expect(optimistic).toEqual([])
+    expect(createdSessions).toEqual([])
+  })
+})
diff --git a/packages/app/src/components/settings-general.tsx b/packages/app/src/components/settings-general.tsx
index b94f42897afa..aa3af6b1c187 100644
--- a/packages/app/src/components/settings-general.tsx
+++ b/packages/app/src/components/settings-general.tsx
@@ -258,6 +258,11 @@ export const SettingsGeneral: Component = () => {
     { value: "dark", label: language.t("theme.scheme.dark") },
   ])
 
+  const followupOptions = createMemo((): { value: "queue" | "steer"; label: string }[] => [
+    { value: "queue", label: language.t("settings.general.row.followup.option.queue") },
+    { value: "steer", label: language.t("settings.general.row.followup.option.steer") },
+  ])
+
   const languageOptions = createMemo(() =>
     language.locales.map((locale) => ({
       value: locale,
@@ -388,6 +393,24 @@ export const SettingsGeneral: Component = () => {
           </div>
         </SettingsRow>
 
+        <SettingsRow
+          title={language.t("settings.general.row.followup.title")}
+          description={language.t("settings.general.row.followup.description")}
+        >
+          <Select
+            data-action="settings-followup"
+            options={followupOptions()}
+            current={followupOptions().find((o) => o.value === settings.general.followup())}
+            value={(o) => o.value}
+            label={(o) => o.label}
+            onSelect={(option) => option && settings.general.setFollowup(option.value)}
+            variant="secondary"
+            size="small"
+            triggerVariant="settings"
+            triggerStyle={{ "min-width": "180px" }}
+          />
+        </SettingsRow>
+
         <SettingsRow
           title={language.t("settings.general.row.showSessionProgressBar.title")}
           description={language.t("settings.general.row.showSessionProgressBar.description")}
diff --git a/packages/app/src/context/settings.tsx b/packages/app/src/context/settings.tsx
index be2fb49d7e0c..0b9415a2f648 100644
--- a/packages/app/src/context/settings.tsx
+++ b/packages/app/src/context/settings.tsx
@@ -162,11 +162,6 @@ export const { use: useSettings, provider: SettingsProvider } = createSimpleCont
       root.style.setProperty("--font-family-sans", sansFontFamily(store.appearance?.sans))
     })
 
-    createEffect(() => {
-      if (store.general?.followup !== "queue") return
-      setStore("general", "followup", "steer")
-    })
-
     return {
       ready,
       get current() {
@@ -181,12 +176,9 @@ export const { use: useSettings, provider: SettingsProvider } = createSimpleCont
         setReleaseNotes(value: boolean) {
           setStore("general", "releaseNotes", value)
         },
-        followup: withFallback(
-          () => (store.general?.followup === "queue" ? "steer" : store.general?.followup),
-          defaultSettings.general.followup,
-        ),
+        followup: withFallback(() => store.general?.followup, defaultSettings.general.followup),
         setFollowup(value: "queue" | "steer") {
-          setStore("general", "followup", value === "queue" ? "steer" : value)
+          setStore("general", "followup", value)
         },
         showFileTree: withFallback(() => store.general?.showFileTree, defaultSettings.general.showFileTree),
         setShowFileTree(value: boolean) {
diff --git a/packages/app/src/pages/session.tsx b/packages/app/src/pages/session.tsx
index 671a88490006..dd3a84c64e00 100644
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -58,6 +58,7 @@ import { syncSessionModel } from "@/pages/session/session-model-helpers"
 import { SessionSidePanel } from "@/pages/session/session-side-panel"
 import { TerminalPanel } from "@/pages/session/terminal-panel"
 import { useSessionCommands } from "@/pages/session/use-session-commands"
+import { shouldAutoSendFollowup, shouldQueueFollowup } from "@/pages/session/session-followup-state"
 import { useSessionHashScroll } from "@/pages/session/use-session-hash-scroll"
 import { shouldUseV2NewSessionPage } from "@/pages/session/new-session-layout"
 import { Identifier } from "@/utils/id"
@@ -1414,7 +1415,12 @@ export default function Page() {
   const queueEnabled = createMemo(() => {
     const id = params.id
     if (!id) return false
-    return settings.general.followup() === "queue" && busy(id) && !composer.blocked() && !isChildSession()
+    return shouldQueueFollowup({
+      followup: settings.general.followup(),
+      busy: busy(id),
+      blocked: composer.blocked(),
+      child: isChildSession(),
+    })
   })
 
   const followupText = (item: FollowupDraft) => {
@@ -1573,15 +1579,21 @@ export default function Page() {
     if (!sessionID) return
 
     const item = queuedFollowups()[0]
-    if (!item) return
-    if (followupBusy(sessionID)) return
-    if (followup.failed[sessionID] === item.id) return
-    if (followup.paused[sessionID]) return
-    if (isChildSession()) return
-    if (composer.blocked()) return
-    if (busy(sessionID)) return
+    if (
+      !shouldAutoSendFollowup({
+        hasItem: !!item,
+        sending: followupBusy(sessionID),
+        failed: followup.failed[sessionID] === item?.id,
+        paused: !!followup.paused[sessionID],
+        blocked: composer.blocked(),
+        busy: busy(sessionID),
+        child: isChildSession(),
+      })
+    ) {
+      return
+    }
 
-    void sendFollowup(sessionID, item.id)
+    void sendFollowup(sessionID, item!.id)
   })
 
   createResizeObserver(
diff --git a/packages/app/src/pages/session/session-followup-state.test.ts b/packages/app/src/pages/session/session-followup-state.test.ts
new file mode 100644
index 000000000000..28e6f9bbb0d9
--- /dev/null
+++ b/packages/app/src/pages/session/session-followup-state.test.ts
@@ -0,0 +1,149 @@
+import { describe, expect, test } from "bun:test"
+import { shouldAutoSendFollowup, shouldQueueFollowup } from "./session-followup-state"
+
+describe("shouldQueueFollowup", () => {
+  test("queues only when queue mode is enabled for a busy root session", () => {
+    expect(
+      shouldQueueFollowup({
+        followup: "queue",
+        busy: true,
+        blocked: false,
+        child: false,
+      }),
+    ).toBe(true)
+  })
+
+  test("does not queue when follow-up behavior is steer", () => {
+    expect(
+      shouldQueueFollowup({
+        followup: "steer",
+        busy: true,
+        blocked: false,
+        child: false,
+      }),
+    ).toBe(false)
+  })
+
+  test("does not queue while the session is idle, blocked, or a child", () => {
+    expect(
+      shouldQueueFollowup({
+        followup: "queue",
+        busy: false,
+        blocked: false,
+        child: false,
+      }),
+    ).toBe(false)
+    expect(
+      shouldQueueFollowup({
+        followup: "queue",
+        busy: true,
+        blocked: true,
+        child: false,
+      }),
+    ).toBe(false)
+    expect(
+      shouldQueueFollowup({
+        followup: "queue",
+        busy: true,
+        blocked: false,
+        child: true,
+      }),
+    ).toBe(false)
+  })
+})
+
+describe("shouldAutoSendFollowup", () => {
+  test("auto-sends only when the head item is ready to run", () => {
+    expect(
+      shouldAutoSendFollowup({
+        hasItem: true,
+        sending: false,
+        failed: false,
+        paused: false,
+        blocked: false,
+        busy: false,
+        child: false,
+      }),
+    ).toBe(true)
+  })
+
+  test("does not auto-send when any blocking state is active", () => {
+    expect(
+      shouldAutoSendFollowup({
+        hasItem: false,
+        sending: false,
+        failed: false,
+        paused: false,
+        blocked: false,
+        busy: false,
+        child: false,
+      }),
+    ).toBe(false)
+    expect(
+      shouldAutoSendFollowup({
+        hasItem: true,
+        sending: true,
+        failed: false,
+        paused: false,
+        blocked: false,
+        busy: false,
+        child: false,
+      }),
+    ).toBe(false)
+    expect(
+      shouldAutoSendFollowup({
+        hasItem: true,
+        sending: false,
+        failed: true,
+        paused: false,
+        blocked: false,
+        busy: false,
+        child: false,
+      }),
+    ).toBe(false)
+    expect(
+      shouldAutoSendFollowup({
+        hasItem: true,
+        sending: false,
+        failed: false,
+        paused: true,
+        blocked: false,
+        busy: false,
+        child: false,
+      }),
+    ).toBe(false)
+    expect(
+      shouldAutoSendFollowup({
+        hasItem: true,
+        sending: false,
+        failed: false,
+        paused: false,
+        blocked: true,
+        busy: false,
+        child: false,
+      }),
+    ).toBe(false)
+    expect(
+      shouldAutoSendFollowup({
+        hasItem: true,
+        sending: false,
+        failed: false,
+        paused: false,
+        blocked: false,
+        busy: true,
+        child: false,
+      }),
+    ).toBe(false)
+    expect(
+      shouldAutoSendFollowup({
+        hasItem: true,
+        sending: false,
+        failed: false,
+        paused: false,
+        blocked: false,
+        busy: false,
+        child: true,
+      }),
+    ).toBe(false)
+  })
+})
diff --git a/packages/app/src/pages/session/session-followup-state.ts b/packages/app/src/pages/session/session-followup-state.ts
new file mode 100644
index 000000000000..69c57c38726c
--- /dev/null
+++ b/packages/app/src/pages/session/session-followup-state.ts
@@ -0,0 +1,17 @@
+export const shouldQueueFollowup = (input: {
+  followup: "queue" | "steer"
+  busy: boolean
+  blocked: boolean
+  child: boolean
+}) => input.followup === "queue" && input.busy && !input.blocked && !input.child
+
+export const shouldAutoSendFollowup = (input: {
+  hasItem: boolean
+  sending: boolean
+  failed: boolean
+  paused: boolean
+  blocked: boolean
+  busy: boolean
+  child: boolean
+}) =>
+  input.hasItem && !input.sending && !input.failed && !input.paused && !input.blocked && !input.busy && !input.child