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