diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaClassInheritorsSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaClassInheritorsSearcher.java
index 4033e4aa25c0..34709ed13d02 100644
--- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaClassInheritorsSearcher.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaClassInheritorsSearcher.java
@@ -85,6 +85,12 @@ public class JavaClassInheritorsSearcher extends QueryExecutorBase<PsiClass, Cla
       return;
     }
 
+    if (!parameters.isCheckDeep() && ApplicationManager.getApplication().isDispatchThread()) {
+      // optimisation: if under EDT we've been asked for one inheritor, to improve latency do not bother to compute and cache them all
+      DirectClassInheritorsSearch.search(baseClass, searchScope).forEach(consumer);
+      return;
+    }
+
     Iterable<PsiClass> cached = getOrComputeSubClasses(project, baseClass, searchScope);
 
     for (final PsiClass subClass : cached) {