diff --git a/apps/web/components/task/chat/queued-message-indicator.tsx b/apps/web/components/task/chat/queued-message-indicator.tsx
index f6f66724a7..de7cb338c6 100644
--- a/apps/web/components/task/chat/queued-message-indicator.tsx
+++ b/apps/web/components/task/chat/queued-message-indicator.tsx
@@ -47,11 +47,12 @@ function QueuedEditView({
     <div className="p-2 space-y-2">
       <Textarea
         ref={textareaRef}
+        data-testid="queue-edit-textarea"
         value={editValue}
         onChange={(e) => onChange(e.target.value)}
         onKeyDown={onKeyDown}
         className={cn(
-          "min-h-[60px] resize-none",
+          "min-h-[60px] max-h-[200px] overflow-y-auto resize-none",
           "bg-white dark:bg-gray-900",
           "border-blue-300 dark:border-blue-700",
           "focus:ring-blue-500 focus:border-blue-500",
diff --git a/apps/web/e2e/tests/chat/message-queue.spec.ts b/apps/web/e2e/tests/chat/message-queue.spec.ts
index e565969e12..751fe8a38e 100644
--- a/apps/web/e2e/tests/chat/message-queue.spec.ts
+++ b/apps/web/e2e/tests/chat/message-queue.spec.ts
@@ -234,6 +234,70 @@ test.describe("Task session queue", () => {
     await expect(session.idleInput()).toBeVisible({ timeout: 30_000 });
   });
 
+  test("queue editor textarea scrolls when content is long", async ({
+    testPage,
+    apiClient,
+    seedData,
+  }) => {
+    test.setTimeout(90_000);
+
+    const session = await seedTaskAndWaitForIdle(
+      testPage,
+      apiClient,
+      seedData,
+      "Queue editor scroll test",
+    );
+
+    // Send a slow command to keep the agent busy.
+    await session.sendMessage("/slow 10s");
+    await expect(session.agentStatus()).toBeVisible({ timeout: 15_000 });
+    await testPage.waitForTimeout(500);
+
+    // Type a short message while agent is busy and queue it.
+    const editor = testPage.locator(".tiptap.ProseMirror").first();
+    await typeWhileBusy(testPage, editor, "short queued msg");
+
+    const submitBtn = testPage.getByTestId("submit-message-button");
+    await expect(submitBtn).toBeVisible({ timeout: 5_000 });
+    await submitBtn.click();
+
+    // Verify the queued indicator appears, then click edit.
+    const editBtn = testPage.getByTitle("Edit message");
+    await expect(editBtn).toBeVisible({ timeout: 10_000 });
+    await editBtn.click();
+
+    // The edit textarea should now be visible.
+    const textarea = testPage.getByTestId("queue-edit-textarea");
+    await expect(textarea).toBeVisible({ timeout: 5_000 });
+
+    // Fill via native setter + React event so the controlled component updates.
+    const longText = Array.from(
+      { length: 30 },
+      (_, i) => `Line ${i + 1} of scroll test content`,
+    ).join("\n");
+    await textarea.evaluate((el: HTMLTextAreaElement, text: string) => {
+      const setter = Object.getOwnPropertyDescriptor(HTMLTextAreaElement.prototype, "value")!.set!;
+      setter.call(el, text);
+      el.dispatchEvent(new Event("input", { bubbles: true }));
+      el.dispatchEvent(new Event("change", { bubbles: true }));
+    }, longText);
+
+    // Allow layout to settle after content change.
+    await testPage.waitForTimeout(300);
+
+    // Verify the textarea has a constrained max-height and is scrollable.
+    const metrics = await textarea.evaluate((el: HTMLTextAreaElement) => ({
+      scrollHeight: el.scrollHeight,
+      clientHeight: el.clientHeight,
+      maxHeight: getComputedStyle(el).maxHeight,
+      overflowY: getComputedStyle(el).overflowY,
+    }));
+
+    expect(metrics.scrollHeight).toBeGreaterThan(metrics.clientHeight);
+    expect(metrics.maxHeight).toBe("200px");
+    expect(metrics.overflowY).toBe("auto");
+  });
+
   test("queue message with plan mode enabled via submit button", async ({
     testPage,
     apiClient,