diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
index 057d2e3591a2..ea9aa3d7102c 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
@@ -1329,6 +1329,9 @@ public abstract class ChooseByNameBase {
         }
       }
       if (commonPrefix == null) commonPrefix = "";
+      if (!StringUtil.startsWithIgnoreCase(commonPrefix, pattern)) {
+        commonPrefix = pattern;
+      }
       final String newPattern = commonPrefix;
 
       myHistory.add(Pair.create(oldText, oldPos));