diff --git a/src/engine/runtime.js b/src/engine/runtime.js
index 8908fdaad..5e0a0cf5b 100644
--- a/src/engine/runtime.js
+++ b/src/engine/runtime.js
@@ -1490,7 +1490,7 @@ class Runtime extends EventEmitter {
             const target = thread.target;
             if (target === this._editingTarget) {
                 const blockForThread = thread.blockGlowInFrame;
-                if (thread.requestScriptGlowInFrame) {
+                if (thread.requestScriptGlowInFrame || thread.stackClick) {
                     let script = target.blocks.getTopLevelScript(blockForThread);
                     if (!script) {
                         // Attempt to find in flyout blocks.