diff --git a/lib/ace/VirtualRenderer.js b/lib/ace/VirtualRenderer.js
index 21042538..d56d62f9 100644
--- a/lib/ace/VirtualRenderer.js
+++ b/lib/ace/VirtualRenderer.js
@@ -298,7 +298,7 @@ var VirtualRenderer = function(container, theme) {
     };
 
     this.$updateScrollBar = function() {
-        this.scrollBar.setInnerHeight(this.doc.getLength() * this.lineHeight + this.$padding);
+        this.scrollBar.setInnerHeight(this.doc.getLength() * this.lineHeight);
         this.scrollBar.setScrollTop(this.scrollTop);
     };
 
@@ -522,10 +522,7 @@ var VirtualRenderer = function(container, theme) {
     };
 
     this.scrollToY = function(scrollTop) {
-        var maxHeight = this.lines.length * this.lineHeight - this.$size.scrollerHeight + this.$padding;
-        if (scrollTop >= maxHeight - this.$padding)
-            scrollTop = maxHeight;
-
+        var maxHeight = this.lines.length * this.lineHeight - this.$size.scrollerHeight;
         var scrollTop = Math.max(0, Math.min(maxHeight, scrollTop));
 
         if (this.scrollTop !== scrollTop) {