diff --git a/history.txt b/history.txt
index aefd8758..ad8adff5 100755
--- a/history.txt
+++ b/history.txt
@@ -1691,3 +1691,4 @@ ______
 * Morphic: Allow triggers to be dragged if so specified (#83)
 * GUI: select dragged costume
 * Blocks: eraser symbol for paint editor
+* Morphic: ScrollFrame scrollY() fix (fixes #24)
diff --git a/morphic.js b/morphic.js
index bd54d86f..436edea8 100644
--- a/morphic.js
+++ b/morphic.js
@@ -8705,6 +8705,9 @@ ScrollFrameMorph.prototype.scrollY = function (steps) {
     }
     if (newY + ch < b) {
         newY = b - ch;
+        if (newY > t) {
+            newY = t;
+        }
     }
     if (newY !== ct) {
         this.contents.setTop(newY);