diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index 7cc6cdb7..74a82d1e 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -74,7 +74,7 @@ var Editor =function(renderer, session) {
     this.$selectionMarker = null;
     this.$highlightLineMarker = null;
     this.$blockScrolling = 0;
-    this.$selectedWordMarkers = [];
+    this.$selectionOccurrences = [];
 
     this.$search = new Search().set({
         wrap: true
@@ -237,7 +237,7 @@ var Editor =function(renderer, session) {
     };
 
     this.highlightSelection = function() {
-        if (this.$selectedWordMarkers.length)
+        if (this.$selectionOccurrences.length)
             this.clearSelectionHighlight();
 
         var selectedRange = this.getSelectionRange();
@@ -253,15 +253,17 @@ var Editor =function(renderer, session) {
         this.$search.set(newOptions);
 
         var ranges = this.$search.findAll(this.session);
-        this.$selectedWordMarkers = [];
+        this.$selectionOccurrences = [];
         ranges.forEach(function(range) {
             if (!range.contains(selectedRange.start.row, selectedRange.start.column))
-                this.$selectedWordMarkers.push(this.renderer.addMarker(range, "ace_selected_word"));
+                this.$selectionOccurrences.push(this.renderer.addMarker(range, "ace_selected_word"));
         }, this);
+
+        this.$search.set(currentOptions);
     };
 
     this.clearSelectionHighlight = function() {
-        this.$selectedWordMarkers.forEach(function(marker) {
+        this.$selectionOccurrences.forEach(function(marker) {
             this.renderer.removeMarker(marker);
         }, this);
     };