diff --git a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
index 8c8e49bd030a..8580bec1c398 100644
--- a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
+++ b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
@@ -329,9 +329,15 @@ public class JavaDocInfoGenerator {
     final PsiTypeParameter[] typeParameters = aClass.getTypeParameters();
     for (PsiTypeParameter typeParameter : typeParameters) {
       final DocTagLocator<PsiDocTag> locator = parameterLocator("<" + typeParameter.getName() + ">");
-      final Pair<PsiDocTag, InheritDocProvider<PsiDocTag>> pair = findInHierarchy(aClass, locator);
-      if (pair != null) {
-        result.add(pair);
+      final Pair<PsiDocTag, InheritDocProvider<PsiDocTag>> inClassComment = findInClassComment(aClass, locator);
+      if (inClassComment != null) {
+        result.add(inClassComment);
+      }
+      else {
+        final Pair<PsiDocTag, InheritDocProvider<PsiDocTag>> pair = findInHierarchy(aClass, locator);
+        if (pair != null) {
+          result.add(pair);
+        }
       }
     }
     generateTypeParametersSection(buffer, result);