diff --git a/webapp/packages/core-blocks/src/useFocus.ts b/webapp/packages/core-blocks/src/useFocus.ts
index 395a045398..012d88deac 100644
--- a/webapp/packages/core-blocks/src/useFocus.ts
+++ b/webapp/packages/core-blocks/src/useFocus.ts
@@ -99,6 +99,7 @@ export function useFocus<T extends HTMLElement>({
         }
 
         this.lastFocus?.focus();
+        this.lastFocus = null;
       },
     }),
     {