diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js
index f757e611..965b9a0f 100644
--- a/lib/ace/virtual_renderer.js
+++ b/lib/ace/virtual_renderer.js
@@ -212,7 +212,8 @@ var VirtualRenderer = function(container, theme) {
             this.scroller.style.width = Math.max(0, width - gutterWidth - this.scrollBar.getWidth()) + "px";
 
             if (this.session.getUseWrapMode()) {
-                var limit = Math.floor(this.scroller.clientWidth / this.characterWidth);
+                var availableWidth = this.scroller.clientWidth - this.$padding * 2;
+                var limit = Math.floor(availableWidth / this.characterWidth) - 1;
                 if (this.session.adjustWrapLimit(limit) || force) {
                     changes = changes | this.CHANGE_FULL;
                 }