diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js
index 2cd22bc7..729e9af5 100644
--- a/lib/ace/virtual_renderer.js
+++ b/lib/ace/virtual_renderer.js
@@ -95,7 +95,7 @@ var VirtualRenderer = function(container, theme) {
     this.scrollBar = new ScrollBar(container);
     this.scrollBar.addEventListener("scroll", this.onScroll.bind(this));
 
-    this.scrollTop = this.desiredScrollTop = 0;
+    this.scrollTop = 0;
 
     this.cursorPos = {
         row : 0,
@@ -470,8 +470,7 @@ var VirtualRenderer = function(container, theme) {
             this.scroller.style.overflowX = horizScroll ? "scroll" : "hidden";
 
         var maxHeight = this.session.getScreenLength() * this.lineHeight;
-        this.scrollTop = this.desiredScrollTop =
-                Math.max(0, Math.min(this.desiredScrollTop, maxHeight - this.$size.scrollerHeight));
+        this.scrollTop = Math.max(0, Math.min(this.scrollTop, maxHeight - this.$size.scrollerHeight));
 
         var lineCount = Math.ceil(minHeight / this.lineHeight) - 1;
         var firstRow = Math.max(0, Math.round((this.scrollTop - offset) / this.lineHeight));
@@ -617,11 +616,11 @@ var VirtualRenderer = function(container, theme) {
         var left = pos.left + this.$padding;
         var top = pos.top;
 
-        if (this.desiredScrollTop > top) {
+        if (this.scrollTop > top) {
             this.scrollToY(top);
         }
 
-        if (this.desiredScrollTop + this.$size.scrollerHeight < top + this.lineHeight) {
+        if (this.scrollTop + this.$size.scrollerHeight < top + this.lineHeight) {
             this.scrollToY(top + this.lineHeight - this.$size.scrollerHeight);
         }
 
@@ -675,9 +674,10 @@ var VirtualRenderer = function(container, theme) {
     this.scrollToY = function(scrollTop) {
         // after calling scrollBar.setScrollTop
         // scrollbar sends us event with same scrollTop. ignore it
-        if (this.desiredScrollTop !== scrollTop) {
+        scrollTop = Math.max(0, scrollTop);
+        if (this.scrollTop !== scrollTop) {
             this.$loop.schedule(this.CHANGE_SCROLL);
-            this.desiredScrollTop = scrollTop;
+            this.scrollTop = scrollTop;
         }
     };