diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index f9994c52..6afa7107 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -1010,7 +1010,7 @@ var EditSession = function(text, mode) {
                 removedFolds = this.getFoldsInRange(e.data.range);
                 this.removeFolds(removedFolds);
 
-                var foldLine = this.getFoldLine(lastRow);
+                var foldLine = this.getFoldLine(end.row);
                 var idx = 0;
                 if (foldLine) {
                     foldLine.addRemoveChars(end.row, end.column, start.column - end.column);
@@ -1026,7 +1026,7 @@ var EditSession = function(text, mode) {
 
                 for (idx; idx < foldLines.length; idx++) {
                     var foldLine = foldLines[idx];
-                    if (foldLine.start.row >= lastRow) {
+                    if (foldLine.start.row >= end.row) {
                         foldLine.shiftRow(-len);
                     }
                 }