2 files changed, 5 insertions, 0 deletions
diff --git a/blocks.js b/blocks.js
index 6ab6781..5a15fa4 100644
--- a/blocks.js
+++ b/blocks.js
@@ -1627,6 +1627,7 @@ SyntaxElementMorph.prototype.showBubble = function (value) {
         img,
         morphToShow,
         isClickable = false,
+        sf = this.parentThatIsA(ScrollFrameMorph),
         wrrld = this.world();
 
     if ((value === undefined) || !wrrld) {
@@ -1694,6 +1695,9 @@ SyntaxElementMorph.prototype.showBubble = function (value) {
         this.rightCenter().add(new Point(2, 0)),
         isClickable
     );
+    if (sf) {
+        bubble.keepWithin(sf);
+    }
 };
 
 // SyntaxElementMorph code mapping
diff --git a/history.txt b/history.txt
index 8ae0a42..0568bda 100755
--- a/history.txt
+++ b/history.txt
@@ -2249,3 +2249,4 @@ ______
 * updated Portuguese translation, thanks, Manuel!
 * updated German translation
 * Morphic: fixed #497 (prevent bubble shadows from getting cut-off)
+* Blocks: keep result-bubbles within the enclosing scripting pane