diff --git a/build/demo/kitchen-sink/kitchen-sink-uncompressed.js b/build/demo/kitchen-sink/kitchen-sink-uncompressed.js
index c35215e7..49527b33 100644
--- a/build/demo/kitchen-sink/kitchen-sink-uncompressed.js
+++ b/build/demo/kitchen-sink/kitchen-sink-uncompressed.js
@@ -21387,7 +21387,10 @@ var Editor = function(renderer, session) {
 
         this.onChangeMode();
 
+        this.$blockScrolling += 1;
         this.onCursorChange();
+        this.$blockScrolling -= 1;
+
         this.onScrollTopChange();
         this.onScrollLeftChange();
         this.onSelectionChange();
diff --git a/build/src/ace-uncompressed-noconflict.js b/build/src/ace-uncompressed-noconflict.js
index d3757da3..b2888f3a 100644
--- a/build/src/ace-uncompressed-noconflict.js
+++ b/build/src/ace-uncompressed-noconflict.js
@@ -2546,7 +2546,10 @@ var Editor = function(renderer, session) {
 
         this.onChangeMode();
 
+        this.$blockScrolling += 1;
         this.onCursorChange();
+        this.$blockScrolling -= 1;
+
         this.onScrollTopChange();
         this.onScrollLeftChange();
         this.onSelectionChange();
diff --git a/build/src/ace-uncompressed.js b/build/src/ace-uncompressed.js
index 7c4fe5d2..2cad9a0e 100644
--- a/build/src/ace-uncompressed.js
+++ b/build/src/ace-uncompressed.js
@@ -2546,7 +2546,10 @@ var Editor = function(renderer, session) {
 
         this.onChangeMode();
 
+        this.$blockScrolling += 1;
         this.onCursorChange();
+        this.$blockScrolling -= 1;
+
         this.onScrollTopChange();
         this.onScrollLeftChange();
         this.onSelectionChange();
diff --git a/build/textarea/src/ace-bookmarklet.js b/build/textarea/src/ace-bookmarklet.js
index 73807363..014130ce 100644
--- a/build/textarea/src/ace-bookmarklet.js
+++ b/build/textarea/src/ace-bookmarklet.js
@@ -3112,7 +3112,10 @@ var Editor = function(renderer, session) {
 
         this.onChangeMode();
 
+        this.$blockScrolling += 1;
         this.onCursorChange();
+        this.$blockScrolling -= 1;
+
         this.onScrollTopChange();
         this.onScrollLeftChange();
         this.onSelectionChange();
diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index b003146f..11cdda66 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -174,7 +174,10 @@ var Editor = function(renderer, session) {
 
         this.onChangeMode();
 
+        this.$blockScrolling += 1;
         this.onCursorChange();
+        this.$blockScrolling -= 1;
+
         this.onScrollTopChange();
         this.onScrollLeftChange();
         this.onSelectionChange();