diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFinderImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFinderImpl.java
index fa441a00418a..8402aa457246 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFinderImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFinderImpl.java
@@ -117,7 +117,12 @@ public final class PsiElementFinderImpl extends PsiElementFinder implements Dumb
     }
 
     if (list.size() > 1) {
-      ContainerUtil.quickSort(list, PsiClassUtil.createScopeComparator(scope));
+      if (shortName != null) {
+        ContainerUtil.quickSort(list, PsiClassUtil.createScopeComparator(scope));
+      } else {
+        ContainerUtil.quickSort(list, Comparator.comparing(PsiClass::getName, Comparator.nullsLast(Comparator.naturalOrder()))
+          .thenComparing(PsiClassUtil.createScopeComparator(scope)));
+      }
     }
 
     return list.toArray(PsiClass.EMPTY_ARRAY);