diff --git a/packages/app/src/components/rewind/rewind-menu.tsx b/packages/app/src/components/rewind/rewind-menu.tsx
index 05db2900d..5b1b80e94 100644
--- a/packages/app/src/components/rewind/rewind-menu.tsx
+++ b/packages/app/src/components/rewind/rewind-menu.tsx
@@ -61,11 +61,11 @@ export const RewindMenu = memo(function RewindMenu({
       setPendingMode(mode);
       try {
         await onRewind({ mode, rewoundText });
-        setIsOpen(false);
       } catch {
         // useRewindAgentMutation owns the toast; the menu only owns flow state.
       } finally {
         setPendingMode(null);
+        setIsOpen(false);
       }
     },
     [isLocked, onRewind, rewoundText],