diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js
index 2120af7c88c..51c25143e10 100644
--- a/src/project/ProjectManager.js
+++ b/src/project/ProjectManager.js
@@ -908,8 +908,11 @@ define(function (require, exports, module) {
     function showInTree(entry) {
         return _findTreeNode(entry)
             .done(function ($node) {
-                // jsTree will automatically expand parent nodes to ensure visible
-                _projectTree.jstree("select_node", $node, false);
+                _projectTree.jstree("deselect_node", _lastSelected);
+                _lastSelected = null;
+                _projectTree.jstree("select_node", $node);
+                _lastSelected = $node;
+                _redraw(true, true);
             });
     }
     
diff --git a/src/search/FindInFiles.js b/src/search/FindInFiles.js
index 106981ac661..fac3b290ce5 100644
--- a/src/search/FindInFiles.js
+++ b/src/search/FindInFiles.js
@@ -306,6 +306,7 @@ define(function (require, exports, module) {
                                     .done(function (doc) {
                                         // Opened document is now the current main editor
                                         EditorManager.getCurrentFullEditor().setSelection(match.start, match.end, true);
+                                        ProjectManager.showInTree(doc.file);
                                     });
                             });
                             resultsDisplayed++;