diff --git a/lib/ace/incremental_search.js b/lib/ace/incremental_search.js
index 806622a3..1fdf6515 100644
--- a/lib/ace/incremental_search.js
+++ b/lib/ace/incremental_search.js
@@ -199,11 +199,11 @@ require("./config").defineOptions(Editor.prototype, "editor", {
     useIncrementalSearch: {
         set: function(val) {
             var iSearchCommands = require("ace/commands/incremental_search_commands").iSearchStartCommands;
-            var kbd = ace.getKeyboardHandler();
+            var kbd = this.getKeyboardHandler();
+            patchHighlightMarkerStyling({enable: val});
             if (val) {
                 // enable for whole editor
                 this.commands.addCommands(iSearchCommands);
-                patchHighlightMarkerStyling({enable: true});
                 if (kbd.isEmacs) { // adapt emacs key handler if used
                     kbd.oldSearchBindings = {
                         'c-s': kbd.commmandKeyBinding['c-s'],
@@ -214,8 +214,7 @@ require("./config").defineOptions(Editor.prototype, "editor", {
                 }
             } else {
                 this.commands.removeCommands(iSearchCommands);
-                patchHighlightMarkerStyling({enable: false});
-                if (kbd.isEmacs) {
+                if (kbd.isEmacs && kbd.oldSearchBindings) {
                     kbd.bindKey('C-s', kbd.oldSearchBindings['c-s']);
                     kbd.bindKey('C-r', kbd.oldSearchBindings['c-r']);
                 }