From 42440ca6361c1a76c1ad842a9a9a796a5d071776 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <aaron.dodson@raspberrypi.org>
Date: Wed, 29 Apr 2026 15:08:43 -0700
Subject: [PATCH] fix: Fix bug that could cause focus to be lost when deleting
 a block

---
 packages/blockly/core/block_svg.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/blockly/core/block_svg.ts b/packages/blockly/core/block_svg.ts
index e9321754e95..dba65a6b34d 100644
--- a/packages/blockly/core/block_svg.ts
+++ b/packages/blockly/core/block_svg.ts
@@ -918,6 +918,14 @@ export class BlockSvg
     Tooltip.dispose();
     ContextMenu.hide();
 
+    if (animate) {
+      this.unplug(healStack);
+      blockAnimations.disposeUiEffect(this);
+    }
+
+    super.dispose(!!healStack);
+    dom.removeNode(this.svgGroup);
+
     // If this block (or a descendant) was focused, focus its parent or
     // workspace instead.
     const focusManager = getFocusManager();
@@ -956,14 +964,6 @@ export class BlockSvg
         }
       }
     }
-
-    if (animate) {
-      this.unplug(healStack);
-      blockAnimations.disposeUiEffect(this);
-    }
-
-    super.dispose(!!healStack);
-    dom.removeNode(this.svgGroup);
   }
 
   /**