From b4bebfd1bd578e664a3ac7a57d6695ca2e08c706 Mon Sep 17 00:00:00 2001
From: Hyko <punk.flag8609@fastmail.com>
Date: Sat, 25 Apr 2026 19:16:09 -0400
Subject: [PATCH] fix(BlockEditor): preserve selected index only when block id
 and query match

---
 src/shared/components/BlockEditor/BlockEditor.client.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/BlockEditor/BlockEditor.client.js b/src/shared/components/BlockEditor/BlockEditor.client.js
index c233d30..c5abadc 100644
--- a/src/shared/components/BlockEditor/BlockEditor.client.js
+++ b/src/shared/components/BlockEditor/BlockEditor.client.js
@@ -345,7 +345,7 @@ export default function BlockEditor({
       blockId,
       query,
       anchorRect: rect,
-      selectedIndex: prev?.blockId === blockId ? prev.selectedIndex ?? 0 : 0,
+      selectedIndex: (prev?.blockId === blockId && prev?.query === query) ? (prev.selectedIndex ?? 0) : 0,
     }));
   }