From 75096effab5eec5c73eb04839e9df25446dcd3a0 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Thu, 18 Oct 2012 00:45:41 +0200
Subject: [PATCH] on esc selection moves to original position in filtering tree
 in Settings dialog

---
 .../ui/treeStructure/filtered/FilteringTreeBuilder.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);