diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index ef9b0e8a..9ec189e9 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -346,6 +346,8 @@ var Editor =function(renderer, session) {
             var range = this.selection.getRange();
             var style = this.getSelectionStyle();
             session.$selectionMarker = session.addMarker(range, "ace_selection", style);
+        } else {
+            this.$updateHighlightActiveLine();
         }
 
         if (this.$highlightSelectedWord)
@@ -381,6 +383,9 @@ var Editor =function(renderer, session) {
     };
 
     this.onChangeFold = function() {
+        // Update the active line marker as due to folding changes the current
+        // line range on the screen might have changed.
+        this.$updateHighlightActiveLine();
         // TODO: This might be too much updating. Okay for now.
         this.renderer.updateFull();
     };