diff --git a/lib/ace/search.js b/lib/ace/search.js
index b3c3d3df..dedcadea 100644
--- a/lib/ace/search.js
+++ b/lib/ace/search.js
@@ -173,18 +173,18 @@ Search.SELECTION = 2;
      *
     **/
     this.replace = function(input, replacement) {
+        if (!this.$options.regExp)
+            return input == this.$options.needle ? replacement : null;
+        
         var re = this.$assembleRegExp();
         if (!re)
             return;
 
         var match = re.exec(input);
         if (match && match[0].length == input.length) {
-            if (this.$options.regExp) {
-                return input.replace(re, replacement);
-            } else {
-                return replacement;
-            }
-        } else {
+            return input.replace(re, replacement);
+        } 
+        else {
             return null;
         }
     };