diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
index 4ca68d7b3b64..98a148043383 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
@@ -852,11 +852,11 @@ public class HighlightVisitorImpl extends JavaElementVisitor implements Highligh
     }
     else if (resolved instanceof PsiClass) {
       final PsiElement qualifier = element.getQualifier();
-      boolean hasNameHighlighting = qualifier instanceof PsiJavaCodeReferenceElement &&
-                                    ((PsiJavaCodeReferenceElement)qualifier).getTypeParameters().length > 0;
+      boolean highlightByItem = qualifier instanceof PsiJavaCodeReferenceElement && ((PsiJavaCodeReferenceElement)qualifier).getTypeParameters().length > 0 ||
+                                PsiTreeUtil.findChildOfType(element, PsiComment.class) != null;
       final PsiElement referenceNameElement = element.getReferenceNameElement();
       final List<PsiElement> toHighlight = new ArrayList<>();
-      if (hasNameHighlighting && referenceNameElement != null) {
+      if (highlightByItem && referenceNameElement != null) {
         toHighlight.add(referenceNameElement);
         toHighlight.addAll(PsiTreeUtil.findChildrenOfType(element, PsiJavaCodeReferenceElement.class));
       }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/NamesHighlighting.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/NamesHighlighting.java
index 3d647df59fb2..2f31ad36e1ef 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/NamesHighlighting.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/NamesHighlighting.java
@@ -1,4 +1,5 @@
 import <symbolName descr="null" type="CLASS_NAME">java.io</symbolName>.*; // highlight on demand import as class name
+import <symbolName descr="null" type="CLASS_NAME"><symbolName descr="null" type="CLASS_NAME">java</symbolName>.lang</symbolName>/*comment*/.<symbolName descr="null" type="CLASS_NAME">String</symbolName>;
 import static <symbolName descr="null" type="CLASS_NAME">java.io.File</symbolName>.<symbolName descr="null" type="STATIC_FINAL_FIELD">pathSeparator</symbolName>;
 import static <symbolName descr="null" type="CLASS_NAME">java.io.File</symbolName>.*;