diff --git a/java/java-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java b/java/java-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java
index fbbd5bdaeaf5..fd8cb7162d5e 100644
--- a/java/java-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java
+++ b/java/java-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java
@@ -1,6 +1,8 @@
 package com.intellij.psi.impl.search;
 
+import com.intellij.openapi.application.AccessToken;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ReadAction;
 import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.util.Computable;
@@ -88,6 +90,8 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor<PsiClass, Dir
     for (PsiReferenceList referenceList : candidates) {
       ProgressManager.checkCanceled();
       final PsiClass candidate = (PsiClass)referenceList.getParent();
+      if (!checkInheritance(p, aClass, candidate)) continue;
+
       String fqn = ApplicationManager.getApplication().runReadAction(new Computable<String>() {
         public String compute() {
           return candidate.getQualifiedName();
@@ -114,6 +118,8 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor<PsiClass, Dir
 
       for (PsiAnonymousClass candidate : anonymousCandidates) {
         ProgressManager.checkCanceled();
+        if (!checkInheritance(p, aClass, candidate)) continue;
+
         if (!consumer.process(candidate)) return false;
       }
 
@@ -143,6 +149,16 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor<PsiClass, Dir
     return true;
   }
 
+  private static boolean checkInheritance(DirectClassInheritorsSearch.SearchParameters p, PsiClass aClass, PsiClass candidate) {
+    final AccessToken token = ReadAction.start();
+    try {
+      return !p.isCheckInheritance() || candidate.isInheritor(aClass, false);
+    }
+    finally {
+      token.finish();
+    }
+  }
+
   private static boolean processSameNamedClasses(Processor<PsiClass> consumer, PsiClass aClass, List<PsiClass> sameNamedClasses) {
     // if there is a class from the same jar, prefer it
     boolean sameJarClassFound = false;
diff --git a/java/openapi/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java b/java/openapi/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java
index fa9e363b356c..06306f7fad54 100644
--- a/java/openapi/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java
+++ b/java/openapi/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java
@@ -248,7 +248,7 @@ public class ClassInheritorsSearch extends ExtensibleQueryFactory<PsiClass, Clas
       }
 
       currentBase.set(psiClass);
-      if (!DirectClassInheritorsSearch.search(psiClass, projectScope, parameters.isIncludeAnonymous()).forEach(processor)) return false;
+      if (!DirectClassInheritorsSearch.search(psiClass, projectScope, parameters.isIncludeAnonymous(), false).forEach(processor)) return false;
     }
     return true;
   }
diff --git a/java/openapi/src/com/intellij/psi/search/searches/DirectClassInheritorsSearch.java b/java/openapi/src/com/intellij/psi/search/searches/DirectClassInheritorsSearch.java
index 5009de6efa2b..93ec3ebb7775 100644
--- a/java/openapi/src/com/intellij/psi/search/searches/DirectClassInheritorsSearch.java
+++ b/java/openapi/src/com/intellij/psi/search/searches/DirectClassInheritorsSearch.java
@@ -33,17 +33,21 @@ public class DirectClassInheritorsSearch extends ExtensibleQueryFactory<PsiClass
     private final PsiClass myClass;
     private final SearchScope myScope;
     private final boolean myIncludeAnonymous;
+    private final boolean myCheckInheritance;
 
-    public SearchParameters(final PsiClass aClass, SearchScope scope, final boolean includeAnonymous) {
-      myIncludeAnonymous = includeAnonymous;
+    public SearchParameters(PsiClass aClass, SearchScope scope, boolean includeAnonymous, boolean checkInheritance) {
       myClass = aClass;
       myScope = scope;
+      myIncludeAnonymous = includeAnonymous;
+      myCheckInheritance = checkInheritance;
+    }
+
+    public SearchParameters(final PsiClass aClass, SearchScope scope, final boolean includeAnonymous) {
+      this(aClass, scope, includeAnonymous, true);
     }
 
     public SearchParameters(final PsiClass aClass, final SearchScope scope) {
-      myClass = aClass;
-      myScope = scope;
-      myIncludeAnonymous = true;
+      this(aClass, scope, true);
     }
 
     public PsiClass getClassToProcess() {
@@ -54,6 +58,10 @@ public class DirectClassInheritorsSearch extends ExtensibleQueryFactory<PsiClass
       return myScope;
     }
 
+    public boolean isCheckInheritance() {
+      return myCheckInheritance;
+    }
+
     public boolean includeAnonymous() {
       return myIncludeAnonymous;
     }
@@ -70,7 +78,14 @@ public class DirectClassInheritorsSearch extends ExtensibleQueryFactory<PsiClass
   }
 
   public static Query<PsiClass> search(final PsiClass aClass, SearchScope scope, boolean includeAnonymous) {
-    final Query<PsiClass> raw = INSTANCE.createUniqueResultsQuery(new SearchParameters(aClass, scope, includeAnonymous));
+    return search(aClass, scope, includeAnonymous, true);
+  }
+
+  public static Query<PsiClass> search(final PsiClass aClass,
+                                       SearchScope scope,
+                                       boolean includeAnonymous,
+                                       final boolean checkInheritance) {
+    final Query<PsiClass> raw = INSTANCE.createUniqueResultsQuery(new SearchParameters(aClass, scope, includeAnonymous, checkInheritance));
 
     if (!includeAnonymous) {
       return new FilteredQuery<PsiClass>(raw, new Condition<PsiClass>() {