diff --git a/src/editor/EditorManager.js b/src/editor/EditorManager.js
index e52454b4f70..edf35168349 100644
--- a/src/editor/EditorManager.js
+++ b/src/editor/EditorManager.js
@@ -108,32 +108,7 @@ define(function (require, exports, module) {
     function _createEditorForDocument(doc, makeMasterEditor, container, range, additionalKeys) {
         var mode = EditorUtils.getModeFromFileExtension(doc.file.fullPath);
         
-        var extraKeys = {
-            "Ctrl-F" : function () {
-                // No-op, handled in FindReplace.js
-            },
-            "Cmd-F" : function () {
-                // No-op, handled in FindReplace.js
-            },
-            "Ctrl-H": function () {
-                // No-op, handled in FindReplace.js
-            },
-            "Cmd-Alt-F": function () {
-                // No-op, handled in FindReplace.js
-            },
-            "Shift-Ctrl-F": function () {
-                // No-op, handled in FindInFiles.js
-            },
-            "Shift-Cmd-F" : function () {
-                // No-op, handled in FindInFiles.js
-            }
-        };
-        
-        if (additionalKeys) {
-            mergeExtraKeys(null, extraKeys, additionalKeys);
-        }
-
-        return new Editor(doc, makeMasterEditor, mode, container, extraKeys, range);
+        return new Editor(doc, makeMasterEditor, mode, container, additionalKeys, range);
     }
     
     /**
diff --git a/src/nls/strings.js b/src/nls/strings.js
index 2459c58da8d..7382be2ac5a 100644
--- a/src/nls/strings.js
+++ b/src/nls/strings.js
@@ -108,7 +108,6 @@ define(function (require, exports, module) {
     // Find, Replace, Find in Files
     exports.SEARCH_REGEXP_INFO                = "Use /re/ syntax for regexp search";
     exports.WITH                              = "With";
-    exports.SEARCHING                         = "Searching";
     exports.BUTTON_YES                        = "Yes";
     exports.BUTTON_NO                         = "No";
     exports.BUTTON_STOP                       = "Stop";
diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js
index 2feea3f7013..93daa4c5f77 100644
--- a/src/search/FindReplace.js
+++ b/src/search/FindReplace.js
@@ -120,7 +120,7 @@ define(function (require, exports, module) {
                 if (cm.lineCount() < 2000) { // This is too expensive on big documents.
                     var cursor = getSearchCursor(cm, query);
                     while (cursor.findNext()) {
-                        state.marked.push(cm.markText(cursor.from(), cursor.to(), Strings.SEARCHING));
+                        state.marked.push(cm.markText(cursor.from(), cursor.to(), "CodeMirror-searching"));
                     }
                 }
                 state.posFrom = state.posTo = cm.getCursor();