From bce825dacae7ad9e17f27651b801562781bb86bf Mon Sep 17 00:00:00 2001
From: Aaron Dodson <aaron.dodson@raspberrypi.org>
Date: Fri, 24 Apr 2026 09:27:12 -0700
Subject: [PATCH] fix: Don't focus newly created variable blocks when not using
 keyboard navigation (#9764)

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

diff --git a/packages/blockly/core/variables.ts b/packages/blockly/core/variables.ts
index fc81ed5a6..f0015cc60 100644
--- a/packages/blockly/core/variables.ts
+++ b/packages/blockly/core/variables.ts
@@ -16,6 +16,7 @@ import {getFocusManager} from './focus_manager.js';
 import {isLegacyProcedureDefBlock} from './interfaces/i_legacy_procedure_blocks.js';
 import {isVariableBackedParameterModel} from './interfaces/i_variable_backed_parameter_model.js';
 import {IVariableModel, IVariableState} from './interfaces/i_variable_model.js';
+import {keyboardNavigationController} from './keyboard_navigation_controller.js';
 import {Msg} from './msg.js';
 import * as deprecation from './utils/deprecation.js';
 import type {BlockInfo, FlyoutItemInfo} from './utils/toolbox.js';
@@ -427,7 +428,9 @@ export function createVariableButtonHandler(
         const variable = workspace.getVariableMap().createVariable(text, type);
         if (opt_callback) opt_callback(text);
         const flyoutWorkspace = workspace.getFlyout()?.getWorkspace();
-        if (!flyoutWorkspace) return;
+        if (!flyoutWorkspace || !keyboardNavigationController.getIsActive()) {
+          return;
+        }
         const changeListener = (e: Events.Abstract) => {
           // Focus the newly created variable_set block.
           if (e.type === Events.BLOCK_CREATE) {