From c8fbb194e749cbd0ca5931d8d98ab4f618d387cf Mon Sep 17 00:00:00 2001
From: Wroud <wroud@yandex.ru>
Date: Wed, 5 Oct 2022 15:36:31 +0300
Subject: [PATCH] CB-2648 fix(core-blocks): focus restoration

---
 webapp/packages/core-blocks/src/useFocus.ts | 1 +
 1 file changed, 1 insertion(+)

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;
       },
     }),
     {