diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/filtered/FilteringTreeBuilder.java b/platform/platform-api/src/com/intellij/ui/treeStructure/filtered/FilteringTreeBuilder.java
index d6048bfbbe35..1edb42e9b32f 100644
--- a/platform/platform-api/src/com/intellij/ui/treeStructure/filtered/FilteringTreeBuilder.java
+++ b/platform/platform-api/src/com/intellij/ui/treeStructure/filtered/FilteringTreeBuilder.java
@@ -163,7 +163,7 @@ public class FilteringTreeBuilder extends AbstractTreeBuilder {
       public void run() {
         revalidateTree();
 
-        Object toSelect = preferredSelection != null ? preferredSelection : myLastSuccessfulSelect;
+        Object toSelect = myLastSuccessfulSelect != null ? myLastSuccessfulSelect : preferredSelection;
 
         if (adjustSelection && toSelect != null) {
           final FilteringTreeStructure.FilteringNode nodeToSelect = getFilteredStructure().getVisibleNodeFor(toSelect);