diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
index 4fd18a52decb..f653fd0c6c57 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
@@ -901,7 +901,7 @@ public class OptionsEditor extends JPanel implements DataProvider, Place.Navigat
         shouldMoveSelection = false;
       }
 
-      Configurable toSelect = null;
+      Configurable toSelect = adjustSelection ? current : null;
       if (shouldMoveSelection && myHits != null) {
         if (!myHits.getNameHits().isEmpty()) {
           toSelect = suggestToSelect(myHits.getNameHits(), myHits.getNameFullHits());