diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightNamesUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightNamesUtil.java
index b6b136530032..5e8fb9d20af6 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightNamesUtil.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightNamesUtil.java
@@ -62,8 +62,13 @@ public class HighlightNamesUtil {
 
     if (!isDeclaration) {
       if (isCalledOnThis(elementToHighlight)) {
-        PsiClass enclosingClass = PsiTreeUtil.getParentOfType(elementToHighlight, PsiClass.class);
-        isInherited = enclosingClass != null && enclosingClass.isInheritor(method.getContainingClass(), true);
+        final PsiClass containingClass = method.getContainingClass();
+        PsiClass enclosingClass = containingClass == null ? null : PsiTreeUtil.getParentOfType(elementToHighlight, PsiClass.class);
+        while (enclosingClass != null) {
+          isInherited = enclosingClass.isInheritor(containingClass, true);
+          if (isInherited) break;
+          enclosingClass = PsiTreeUtil.getParentOfType(enclosingClass, PsiClass.class, true);
+        }
       }
     }
 
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/NamesHighlighting.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/NamesHighlighting.java
index a92aefa049be..e25fa4ac277e 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/NamesHighlighting.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/NamesHighlighting.java
@@ -59,4 +59,38 @@ class <symbolName descr="null" type="CLASS_NAME">NoCtrClass</symbolName> {
 
 class <symbolName descr="null" type="CLASS_NAME">Generic</symbolName><<symbolName descr="null" type="TYPE_PARAMETER_NAME">TT</symbolName> extends <symbolName descr="null" type="INTERFACE_NAME">Runnable</symbolName>> {
   <symbolName descr="null" type="TYPE_PARAMETER_NAME">TT</symbolName> <symbolName descr="null" type="INSTANCE_FIELD">field</symbolName>;
+}
+
+class <symbolName descr="null" type="CLASS_NAME">InheritedSymbolNames</symbolName> {
+
+  private static class <symbolName descr="null" type="CLASS_NAME">A</symbolName> {
+    public <symbolName descr="null" type="CLASS_NAME">String</symbolName> <symbolName descr="null" type="METHOD_DECLARATION">getName</symbolName>() {
+      return "classA";
+    }
+  }
+
+  private static class <symbolName descr="null" type="CLASS_NAME">B</symbolName> extends <symbolName descr="null" type="CLASS_NAME">A</symbolName> {
+      {
+          new <symbolName descr="null" type="ANONYMOUS_CLASS_NAME">java.lang.Runnable</symbolName>() {
+              public void <symbolName descr="null" type="METHOD_DECLARATION">run</symbolName>() {
+                  <symbolName descr="null" type="INHERITED_METHOD">getName</symbolName>();
+              }
+          };
+          <symbolName descr="null" type="INHERITED_METHOD">getName</symbolName>();
+      }
+  }
+
+  private static class <symbolName descr="null" type="CLASS_NAME">C</symbolName> extends <symbolName descr="null" type="CLASS_NAME">A</symbolName> {
+      {
+          new <symbolName descr="null" type="ANONYMOUS_CLASS_NAME">java.lang.Runnable</symbolName>() {
+              public void <symbolName descr="null" type="METHOD_DECLARATION">run</symbolName>() {
+                  <symbolName descr="null" type="METHOD_CALL">getName</symbolName>();
+              }
+          };
+          <symbolName descr="null" type="METHOD_CALL">getName</symbolName>();
+      }
+      public <symbolName descr="null" type="CLASS_NAME">String</symbolName> <symbolName descr="null" type="METHOD_DECLARATION">getName</symbolName>() {
+          return "classC";
+      }
+  }
 }
\ No newline at end of file