diff --git a/src/search/FindInFilesUI.js b/src/search/FindInFilesUI.js
index 4a8da60714c..4054d5d3a89 100644
--- a/src/search/FindInFilesUI.js
+++ b/src/search/FindInFilesUI.js
@@ -385,10 +385,11 @@ define(function (require, exports, module) {
     
     // Initialize: command handlers
     CommandManager.register(Strings.CMD_FIND_IN_FILES,       Commands.CMD_FIND_IN_FILES,       _showFindBar);
-    CommandManager.register(Strings.CMD_REPLACE_IN_FILES,    Commands.CMD_REPLACE_IN_FILES,    _showReplaceBar);
     CommandManager.register(Strings.CMD_FIND_IN_SELECTED,    Commands.CMD_FIND_IN_SELECTED,    _showFindBarForSubtree);
-    CommandManager.register(Strings.CMD_REPLACE_IN_SELECTED, Commands.CMD_REPLACE_IN_SELECTED, _showReplaceBarForSubtree);
     CommandManager.register(Strings.CMD_FIND_IN_SUBTREE,     Commands.CMD_FIND_IN_SUBTREE,     _showFindBarForSubtree);
+    
+    CommandManager.register(Strings.CMD_REPLACE_IN_FILES,    Commands.CMD_REPLACE_IN_FILES,    _showReplaceBar);
+    CommandManager.register(Strings.CMD_REPLACE_IN_SELECTED, Commands.CMD_REPLACE_IN_SELECTED, _showReplaceBarForSubtree);
     CommandManager.register(Strings.CMD_REPLACE_IN_SUBTREE,  Commands.CMD_REPLACE_IN_SUBTREE,  _showReplaceBarForSubtree);
     
     // Public exports
diff --git a/test/spec/FindInFiles-test.js b/test/spec/FindInFiles-test.js
index 20bce224329..30c2f11f93f 100644
--- a/test/spec/FindInFiles-test.js
+++ b/test/spec/FindInFiles-test.js
@@ -1394,8 +1394,8 @@ define(function (require, exports, module) {
 
                     it("should do a search in folder, replace all from find bar", function () {
                         openTestProjectCopy(defaultSourcePath);
-                        var dirEntry = FileSystem.getDirectoryForPath(defaultSourcePath + "/css/");
-                        openSearchBar(null, true);
+                        var dirEntry = FileSystem.getDirectoryForPath(testPath + "/css/");
+                        openSearchBar(dirEntry, true);
                         executeReplace("foo", "bar", true);
 
                         waitsFor(function () {
@@ -1418,8 +1418,8 @@ define(function (require, exports, module) {
 
                     it("should do a search in file, replace all from find bar", function () {
                         openTestProjectCopy(defaultSourcePath);
-                        var dirEntry = FileSystem.getDirectoryForPath(defaultSourcePath + "/css/foo.css");
-                        openSearchBar(null, true);
+                        var fileEntry = FileSystem.getFileForPath(testPath + "/css/foo.css");
+                        openSearchBar(fileEntry, true);
                         executeReplace("foo", "bar", true);
 
                         waitsFor(function () {