@@ -777,50 +777,55 @@ describe("GhosttyTerminalSurface visibility", () => {
     expect(readText).not.toHaveBeenCalled();
   });
 
-  it("pastes once per shortcut whichever of the clipboard read and native paste lands first", async () => {
+  function paste(surface: GhosttyTerminalSurface, text: string) {
+    surface.input.dispatchEvent(
+      Object.assign(new Event("paste", { cancelable: true }), {
+        clipboardData: { getData: () => text },
+      }),
+    );
+  }
+
+  it.each(["native", "clipboard"])("pastes once when %s arrives first", async (first) => {
     const harness = createHarness();
-    const readText = vi.fn(async () => "echo hi");
-    vi.stubGlobal("navigator", { platform: "MacIntel", clipboard: { readText } });
+    const read = Promise.resolve("echo hi");
+    vi.stubGlobal("navigator", {
+      platform: "MacIntel",
+      clipboard: { readText: () => read },
+    });
     const surface = await harness.create({ beforeKey: () => true });
-    const paste = (text: string) =>
-      surface.input.dispatchEvent(
-        Object.assign(new Event("paste", { cancelable: true }), {
-          clipboardData: { getData: () => text },
-        }),
-      );
-    const settleRead = async (reads: number) => {
-      expect(readText).toHaveBeenCalledTimes(reads);
-      await readText.mock.results[reads - 1]?.value;
-    };
 
-    // Read first (Chromium menu paste): the native paste that follows is dropped.
     key(surface, "v", "KeyV", { metaKey: true });
-    await settleRead(1);
-    paste("echo hi");
-    key(surface, "v", "KeyV", { metaKey: true }, "keyup");
-    expect(harness.onData).toHaveBeenCalledTimes(1);
+    if (first === "native") paste(surface, "echo hi");
+    await read;
+    if (first === "clipboard") paste(surface, "echo hi");
 
-    // Native first: the read that settles afterwards is dropped.
-    key(surface, "v", "KeyV", { metaKey: true });
-    paste("echo hi");
-    await settleRead(2);
-    key(surface, "v", "KeyV", { metaKey: true }, "keyup");
-    expect(harness.onData).toHaveBeenCalledTimes(2);
-
-    // A shortcut served only by the read must not swallow a later Edit → Paste
-    // of the same text, after the keyup or after a blur.
-    key(surface, "v", "KeyV", { metaKey: true });
-    await settleRead(3);
-    key(surface, "v", "KeyV", { metaKey: true }, "keyup");
-    paste("echo hi");
-    key(surface, "v", "KeyV", { metaKey: true });
-    await settleRead(4);
-    surface.input.dispatchEvent(new Event("blur"));
-    paste("echo hi");
-    expect(harness.onData).toHaveBeenCalledTimes(6);
-    expect(new Set(harness.onData.mock.calls.map(([data]) => data))).toEqual(new Set(["echo hi"]));
+    expect(harness.onData.mock.calls).toEqual([["echo hi"]]);
   });
 
+  it.each(["V keyup", "blur", "Meta keyup without V keyup"])(
+    "accepts a later identical menu paste after %s",
+    async (end) => {
+      const harness = createHarness();
+      const read = Promise.resolve("echo hi");
+      vi.stubGlobal("navigator", {
+        platform: "MacIntel",
+        clipboard: { readText: () => read },
+      });
+      const surface = await harness.create({ beforeKey: () => true });
+
+      key(surface, "v", "KeyV", { metaKey: true });
+      await read;
+      expect(harness.onData.mock.calls).toEqual([["echo hi"]]);
+      if (end === "blur") surface.input.dispatchEvent(new Event("blur"));
+      else if (end === "V keyup") key(surface, "v", "KeyV", { metaKey: true }, "keyup");
+      // macOS can omit V keyup while Command is held.
+      else key(surface, "Meta", "MetaLeft", {}, "keyup");
+      paste(surface, "echo hi");
+
+      expect(harness.onData.mock.calls).toEqual([["echo hi"], ["echo hi"]]);
+    },
+  );
+
   it("starts a selection when dragging from a link", async () => {
     const harness = createHarness();
     const onLinkActivate = vi.fn();
 
@@ -580,10 +580,8 @@ export class GhosttyTerminalSurface {
   private theme: GhosttyTheme;
   private readonly suppressedKeyCodes = new Set<string>();
   private pasteShortcutToken = 0;
-  // The paste shortcut whose native paste event may still arrive, and the text
-  // its clipboard read already sent ("" until then). Chromium can deliver that
-  // event after the read resolves, but before the shortcut key's keyup, so the
-  // gesture ends on that keyup, the next shortcut, blur, or the matching paste.
+  // Chromium can deliver native paste after the clipboard read resolves.
+  // Suppress its duplicate only for the current shortcut gesture.
   private pasteShortcutGesture: { code: string; readText: string } | null = null;
   private copyShortcutToken = 0;
   private clearSelectionAfterCopy = false;
@@ -1146,12 +1144,8 @@ export class GhosttyTerminalSurface {
       this.pasteShortcutGesture = gesture;
       const clipboard = navigator.clipboard;
       if (typeof clipboard?.readText === "function") {
-        // Race the async clipboard read against the browser's own paste event.
-        // The read covers browsers whose paste shortcut produces no paste
-        // event; not preventing the default keeps the native path alive when
-        // the read is denied. Whichever lands first wins: a native paste
-        // claims the token, and a read records its text on the gesture so
-        // onPaste drops the native paste that follows (Chromium menu paste).
+        // Keep native paste available if the read is denied. The token drops
+        // a late read; the gesture drops a native duplicate when the read wins.
         const token = ++this.pasteShortcutToken;
         void clipboard.readText().then(
           (text) => {
@@ -1176,7 +1170,15 @@ export class GhosttyTerminalSurface {
   };
 
   private readonly onKeyUp = (event: KeyboardEvent) => {
-    if (event.code === this.pasteShortcutGesture?.code) this.pasteShortcutGesture = null;
+    // macOS can omit V keyup while Command is held.
+    if (
+      event.code === this.pasteShortcutGesture?.code ||
+      event.key === "Meta" ||
+      event.key === "Control" ||
+      event.key === "Shift"
+    ) {
+      this.pasteShortcutGesture = null;
+    }
     if (this.suppressedKeyCodes.delete(event.code)) return;
     if (isTerminalCompositionKey(event, this.composing)) {
       return;