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 02a9ae9f8470..79743de0ab71 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
@@ -1194,7 +1194,8 @@ public abstract class ChooseByNameBase {
       if (myCancelled) {
         throw new ProcessCanceledException();
       }
-      Collections.sort(namesList, new MatchesComparator(pattern));
+      // Here we sort using namePattern to have similar logic with empty qualified patten case
+      Collections.sort(namesList, new MatchesComparator(namePattern));
 
       boolean overflow = false;
       List<Object> sameNameElements = new SmartList<Object>();