From e250737199330cfd43a4e556f9709e5d17fb5e1f Mon Sep 17 00:00:00 2001
From: Aaron Dodson <aaron.dodson@raspberrypi.org>
Date: Mon, 11 May 2026 14:27:09 -0700
Subject: [PATCH] fix: Fix bug that prevented display of move indicators in
 mutator workspaces (#9856)

---
 packages/blockly/core/keyboard_nav/move_indicator.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/blockly/core/keyboard_nav/move_indicator.ts b/packages/blockly/core/keyboard_nav/move_indicator.ts
index b1de2f768..8728ecac6 100644
--- a/packages/blockly/core/keyboard_nav/move_indicator.ts
+++ b/packages/blockly/core/keyboard_nav/move_indicator.ts
@@ -27,7 +27,10 @@ export class MoveIndicator {
     this.svgRoot = dom.createSvgElement(
       Svg.G,
       {},
-      workspace.getLayerManager()?.getDragLayer(),
+      // Mutator workspaces don't have a drag layer, so fall back to the block
+      // layer.
+      workspace.getLayerManager()?.getDragLayer() ??
+        workspace.getLayerManager()?.getBlockLayer(),
     );
     this.svgRoot.classList.add('blocklyMoveIndicator');
     const rtl = workspace.RTL;