diff --git a/packages/blockly/core/block_svg.ts b/packages/blockly/core/block_svg.ts
index 78baf0063..7291f4860 100644
--- a/packages/blockly/core/block_svg.ts
+++ b/packages/blockly/core/block_svg.ts
@@ -1893,7 +1893,8 @@ export class BlockSvg
   onNodeFocus(): void {
     this.recomputeAriaAttributes();
     this.select();
-    if (getFocusManager().getFocusedNode() !== this) {
+    const focusedNode = getFocusManager().getFocusedNode();
+    if (focusedNode && focusedNode !== this) {
       renderManagement.finishQueuedRenders().then(() => {
         this.workspace.scrollBoundsIntoView(
           this.getBoundingRectangleWithoutChildren(),