diff --git a/apps/web/src/components/chat/ChatComposer.tsx b/apps/web/src/components/chat/ChatComposer.tsx
index c55dfb2ca988..65656ba4f2a0 100644
--- a/apps/web/src/components/chat/ChatComposer.tsx
+++ b/apps/web/src/components/chat/ChatComposer.tsx
@@ -6639,6 +6639,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
               {isStashMenuOpen && !composerMenuOpen && !isComposerApprovalState && (
                 <ComposerCommandMenuLayer anchor={composerMenuAnchor}>
                   <ComposerStashMenu
+                    composerFormRef={composerFormRef}
                     entries={stashQueue}
                     stashShortcutLabel={shortcutLabelForCommand(keybindings, "composer.stash", {
                       context: {
diff --git a/apps/web/src/components/chat/ComposerStashMenu.browser.test.tsx b/apps/web/src/components/chat/ComposerStashMenu.browser.test.tsx
new file mode 100644
index 000000000000..7e7cc267d757
--- /dev/null
+++ b/apps/web/src/components/chat/ComposerStashMenu.browser.test.tsx
@@ -0,0 +1,154 @@
+import { act, useRef, useState } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, beforeEach, expect, it, vi } from "vite-plus/test";
+import { page, userEvent } from "vite-plus/test/browser";
+
+import { Dialog, DialogPopup } from "../ui/dialog";
+import { ComposerStashMenu } from "./ComposerStashMenu";
+
+function Composer({ dialog = false }: { dialog?: boolean }) {
+  const composerFormRef = useRef<HTMLFormElement>(null);
+  const [entries, setEntries] = useState(
+    ["first", "second"].map((id) => ({
+      id,
+      createdAt: "2026-10-01T00:00:00.000Z",
+      prompt: `${id} prompt`,
+      attachments: [],
+      droppedImageNames: [],
+    })),
+  );
+  const [draft, setDraft] = useState("Unsent draft");
+  const [open, setOpen] = useState(true);
+  const [dialogOpen, setDialogOpen] = useState(dialog);
+  const [answer, setAnswer] = useState<string | null>(null);
+  return (
+    <>
+      <form ref={composerFormRef}>
+        <textarea
+          aria-label="Message"
+          value={draft}
+          onChange={(event) => setDraft(event.target.value)}
+        />
+        <button type="button" onClick={() => setAnswer("Continue")}>
+          Continue
+        </button>
+        <p role="status">{answer ? `Selected: ${answer}` : "Choose an answer"}</p>
+      </form>
+      <input aria-label="Search threads" />
+      <button onClick={() => setOpen(true)}>Open stash</button>
+      {open && (
+        <ComposerStashMenu
+          composerFormRef={composerFormRef}
+          entries={entries}
+          stashShortcutLabel="Ctrl+S"
+          onRestore={(entry) => {
+            setDraft(entry.prompt);
+            setEntries((current) => current.filter(({ id }) => id !== entry.id));
+            setOpen(false);
+          }}
+          onDelete={(entry) => {
+            setEntries((current) => current.filter(({ id }) => id !== entry.id));
+            if (entries.length === 1) setOpen(false);
+          }}
+          onClose={() => setOpen(false)}
+        />
+      )}
+      <Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
+        <DialogPopup aria-label="Command palette">
+          <input aria-label="Search commands" />
+        </DialogPopup>
+      </Dialog>
+    </>
+  );
+}
+
+let root: Root;
+let container: HTMLDivElement;
+
+beforeEach(() => {
+  vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+  container = document.createElement("div");
+  document.body.append(container);
+  root = createRoot(container);
+});
+
+afterEach(async () => {
+  await act(async () => root.unmount());
+  container.remove();
+  vi.unstubAllGlobals();
+});
+
+const editor = () => page.getByRole("textbox", { name: "Message" });
+const stash = () => page.getByRole("list", { name: "Stashed prompts" });
+const restore = (prompt: string) =>
+  page.getByRole("button", { name: `Restore stashed prompt: ${prompt}` });
+const press = (keys: string) => act(async () => userEvent.keyboard(keys));
+const focus = (element: Element) => act(async () => (element as HTMLElement).focus());
+
+it("leaves dialog, unrelated input and question button shortcuts alone while the stash is open", async () => {
+  await act(async () => root.render(<Composer dialog />));
+  const input = page.getByRole("textbox", { name: "Search commands" }).element();
+  await focus(input);
+
+  for (const key of [
+    { key: "ArrowDown" },
+    { key: "ArrowUp" },
+    { key: "Enter" },
+    { key: "Backspace", ctrlKey: true },
+    { key: "Backspace", metaKey: true },
+  ]) {
+    const event = new KeyboardEvent("keydown", { ...key, bubbles: true, cancelable: true });
+    await act(async () => {
+      input.dispatchEvent(event);
+    });
+    expect(event.defaultPrevented, key.key).toBe(false);
+  }
+
+  await press("{Escape}");
+  await expect.element(page.getByRole("dialog")).not.toBeInTheDocument();
+  expect(stash().element().textContent).toContain("first prompt");
+  expect(stash().element().textContent).toContain("second prompt");
+  await expect.element(editor()).toHaveValue("Unsent draft");
+
+  await focus(page.getByRole("textbox", { name: "Search threads" }).element());
+  await press("{ArrowDown}{Enter}{Control>}{Backspace}{/Control}{Meta>}{Backspace}{/Meta}{Escape}");
+  expect(stash().element().textContent).toContain("first prompt");
+  expect(stash().element().textContent).toContain("second prompt");
+  await expect.element(editor()).toHaveValue("Unsent draft");
+
+  await focus(page.getByRole("button", { name: "Continue", exact: true }).element());
+  await press("{Enter}");
+  expect(page.getByRole("status").element().textContent).toBe("Selected: Continue");
+  expect(stash().element().textContent).toContain("first prompt");
+  expect(stash().element().textContent).toContain("second prompt");
+  await press("{Control>}{Backspace}{/Control}{Meta>}{Backspace}{/Meta}");
+  expect(stash().element().textContent).toContain("first prompt");
+  expect(stash().element().textContent).toContain("second prompt");
+  await expect.element(editor()).toHaveValue("Unsent draft");
+});
+
+it("navigates, deletes and restores stashed prompts from the composer and drawer", async () => {
+  await act(async () => root.render(<Composer />));
+  await focus(restore("first prompt").element());
+  await press("{ArrowDown}");
+  await expect.element(restore("second prompt")).toHaveFocus();
+  await press("{ArrowUp}");
+  await expect.element(restore("first prompt")).toHaveFocus();
+
+  await press("{Control>}{Backspace}{/Control}");
+  await expect.element(restore("first prompt")).not.toBeInTheDocument();
+  expect(stash().element().textContent).toContain("second prompt");
+  await expect.element(editor()).toHaveValue("Unsent draft");
+  expect(document.activeElement).toBe(document.body);
+
+  await press("{Escape}");
+  await expect.element(stash()).not.toBeInTheDocument();
+
+  await act(async () => userEvent.click(page.getByRole("button", { name: "Open stash" })));
+  await expect.element(restore("first prompt")).not.toBeInTheDocument();
+  expect(stash().element().textContent).toContain("second prompt");
+  await focus(editor().element());
+  await press("{ArrowDown}{Enter}");
+  await expect.element(editor()).toHaveValue("second prompt");
+  await expect.element(stash()).not.toBeInTheDocument();
+});
diff --git a/apps/web/src/components/chat/ComposerStashMenu.tsx b/apps/web/src/components/chat/ComposerStashMenu.tsx
index 066aadd02e1e..11df0cca8db6 100644
--- a/apps/web/src/components/chat/ComposerStashMenu.tsx
+++ b/apps/web/src/components/chat/ComposerStashMenu.tsx
@@ -1,5 +1,5 @@
 import { BookmarkIcon, FileIcon, FileTextIcon } from "lucide-react";
-import { memo, useEffect, useRef, useState } from "react";
+import { memo, useEffect, useRef, useState, type RefObject } from "react";
 import { assistantCitationsToPlainText } from "@t3tools/shared/assistantCitations";
 
 import { RelativeTime } from "../RelativeTime";
@@ -35,11 +35,12 @@ function stashEntrySnippet(entry: PromptStashEntry): string {
 export const ComposerStashMenu = memo(function ComposerStashMenu(props: {
   entries: ReadonlyArray<PromptStashEntry>;
   stashShortcutLabel: string | null;
+  composerFormRef: RefObject<HTMLFormElement | null>;
   onRestore: (entry: PromptStashEntry) => void;
   onDelete: (entry: PromptStashEntry) => void;
   onClose: () => void;
 }) {
-  const { entries, stashShortcutLabel, onRestore, onDelete, onClose } = props;
+  const { entries, stashShortcutLabel, composerFormRef, onRestore, onDelete, onClose } = props;
   const drawerRef = useRef<HTMLDivElement>(null);
   const [highlightedId, setHighlightedId] = useState<string | null>(entries[0]?.id ?? null);
 
@@ -63,6 +64,16 @@ export const ComposerStashMenu = memo(function ComposerStashMenu(props: {
 
   useEffect(() => {
     const handler = (event: KeyboardEvent) => {
+      const target = event.target;
+      if (
+        !(target instanceof Node) ||
+        (target !== document.body &&
+          !(target instanceof Element && target.closest('[data-prompt-stash-badge="true"]')) &&
+          !drawerRef.current?.contains(target) &&
+          !composerFormRef.current?.querySelector('textarea, [role="textbox"]')?.contains(target))
+      ) {
+        return;
+      }
       if (event.key === "Escape") {
         event.preventDefault();
         event.stopPropagation();
@@ -107,7 +118,7 @@ export const ComposerStashMenu = memo(function ComposerStashMenu(props: {
     };
     window.addEventListener("keydown", handler, true);
     return () => window.removeEventListener("keydown", handler, true);
-  }, [entries, highlightedEntry, onClose, onDelete, onRestore]);
+  }, [composerFormRef, entries, highlightedEntry, onClose, onDelete, onRestore]);
 
   return (
     <ComposerBanner.Root ref={drawerRef} data-composer-stash-drawer="true">