diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index 068bdaa5..d4f4e877 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -118,6 +118,7 @@ var Editor =function(renderer, doc) {
             this.doc.removeEventListener("change", this.$onDocumentChange);
             this.doc.removeEventListener("changeMode", this.$onDocumentModeChange);
             this.doc.removeEventListener("changeTabSize", this.$onDocumentChangeTabSize);
+            this.doc.removeEventListener("changeWrapMode", this.$onDocumentChangeWrapMode);
             this.doc.removeEventListener("changeBreakpoint", this.$onDocumentChangeBreakpoint);
 
             var selection = this.doc.getSelection();
@@ -139,6 +140,9 @@ var Editor =function(renderer, doc) {
         this.$onDocumentChangeTabSize = this.renderer.updateText.bind(this.renderer);
         doc.addEventListener("changeTabSize", this.$onDocumentChangeTabSize);
 
+        this.$onDocumentChangeWrapMode = this.renderer.updateFull.bind(this.renderer);
+        doc.addEventListener("changeWrapMode", this.$onDocumentChangeWrapMode);
+
         this.$onDocumentChangeBreakpoint = this.onDocumentChangeBreakpoint.bind(this);
         this.doc.addEventListener("changeBreakpoint", this.$onDocumentChangeBreakpoint);
 
diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js
index 385a7d61..18a580f4 100644
--- a/lib/ace/virtual_renderer.js
+++ b/lib/ace/virtual_renderer.js
@@ -351,6 +351,7 @@ var VirtualRenderer = function(container, theme) {
             this.$markerLayer.update(this.layerConfig);
             this.$cursorLayer.update(this.layerConfig);
             this.$updateScrollBar();
+            this.scrollCursorIntoView();
             return;
         }