diff --git a/demo/kitchen-sink/demo.js b/demo/kitchen-sink/demo.js
index abd5deb8..88d5fa0e 100644
--- a/demo/kitchen-sink/demo.js
+++ b/demo/kitchen-sink/demo.js
@@ -430,6 +430,9 @@ bindCheckbox("fade_fold_widgets", function(checked) {
 bindCheckbox("read_only", function(checked) {
     env.editor.setReadOnly(checked);
 });
+bindCheckbox("scrollPastEnd", function(checked) {
+    env.editor.setOption("scrollPastEnd", checked);
+});
 
 bindDropdown("split", function(value) {
     var sp = env.split;
diff --git a/kitchen-sink.html b/kitchen-sink.html
index bb534835..586b317e 100644
--- a/kitchen-sink.html
+++ b/kitchen-sink.html
@@ -274,6 +274,14 @@
         <input type="checkbox" id="read_only">
       </td>
     </tr>
+    <tr>
+      <td >
+        <label for="scrollPastEnd">Scroll Past End</label>
+      </td>
+      <td>
+        <input type="checkbox" id="scrollPastEnd" checked>
+      </td>
+    </tr>
     <tr>
       <td colspan="2">
         <input type="button" value="Edit Snippets" onclick="env.editSnippets()">
diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index 088fbaae..d92666b8 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -2261,6 +2261,7 @@ config.defineOptions(Editor.prototype, "editor", {
     fontFamily: "renderer",
     maxLines: "renderer",
     minLines: "renderer",
+    scrollPastEnd: "renderer",
 
     scrollSpeed: "$mouseHandler",
     dragDelay: "$mouseHandler",