@@ -655,6 +655,10 @@ export function useThreadActions() {
       const pinOrderKey = resolved?.thread.pinnedAt != null ? resolved.thread.pinOrderKey : null;
       const wasPinned = resolved?.thread.pinnedAt != null;
       const snoozedUntil = resolved?.thread.snoozedUntil ?? null;
+      // An older unpin/snooze Undo would re-pin or re-snooze, and the server
+      // treats either as a promotion that un-settles; settling supersedes them.
+      ThreadUndo.invalidate("pin", scopedThreadKey(target));
+      ThreadUndo.invalidate("snooze", scopedThreadKey(target));
       const action = ThreadUndo.begin("settle", scopedThreadKey(target));
       const result = await settleThreadMutation({
         environmentId: target.environmentId,
 
@@ -199,6 +199,17 @@ describe("settle and snooze Undo", () => {
     });
   });
 
+  it("expires an older unpin Undo when the thread is settled", async () => {
+    const add = vi.spyOn(toastManager, "add").mockReturnValue("toast");
+    vi.spyOn(toastManager, "close").mockImplementation(() => {});
+    const actions = useThreadActions();
+    await actions.unpinThread(target);
+    const staleUnpinUndo = undoOf(add, 0);
+    await actions.settleThread(target);
+    await staleUnpinUndo();
+    expect(commands.pin).not.toHaveBeenCalled();
+  });
+
   it("stays silent for batch settles", async () => {
     const add = vi.spyOn(toastManager, "add").mockReturnValue("toast");
     await useThreadActions().settleThread(target, { undoToast: false });
 
@@ -2,6 +2,7 @@ const EDITABLE_SELECTOR = [
   "input",
   "textarea",
   "select",
+  '[contenteditable=""]',
   '[contenteditable="true"]',
   '[contenteditable="plaintext-only"]',
   '[role="textbox"]',