diff --git a/platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionsRegistrarImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionsRegistrarImpl.java
index 1b29d9528380..feaf92005266 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionsRegistrarImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionsRegistrarImpl.java
@@ -43,7 +43,6 @@ import javax.swing.event.DocumentEvent;
 import java.io.IOException;
 import java.net.URL;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Pattern;
 
 /**
@@ -226,7 +225,7 @@ public class SearchableOptionsRegistrarImpl extends SearchableOptionsRegistrar {
 
     final Set<Configurable> currentConfigurables = new HashSet<Configurable>(contentHits);
     if (options.isEmpty()) { //operate with substring
-      options.add(option);
+      Collections.addAll(options, REG_EXP.split(optionToCheck));
     }
     Set<String> helpIds = null;
     for (String opt : options) {