diff --git a/source/com/intellij/psi/impl/source/tree/java/ClassElement.java b/source/com/intellij/psi/impl/source/tree/java/ClassElement.java
index 3cecc27e7b36..c909fbd44bbb 100644
--- a/source/com/intellij/psi/impl/source/tree/java/ClassElement.java
+++ b/source/com/intellij/psi/impl/source/tree/java/ClassElement.java
@@ -33,22 +33,24 @@ public class ClassElement extends RepositoryTreeElement {
 
     PsiClass psiClass = (PsiClass)SourceTreeToPsiMap.treeElementToPsi(this);
     if (anchor == null) {
-      if (before == null) {
-        if (first == last) {
-          PsiElement firstPsi = SourceTreeToPsiMap.treeElementToPsi(first);
-          PsiElement psiElement = firstPsi instanceof PsiMember ? CodeEditUtil.getDefaultAnchor(psiClass, (PsiMember)firstPsi) : null;
-          anchor = psiElement != null ? SourceTreeToPsiMap.psiElementToTree(psiElement) : null;
+      if (first.getElementType() != DOC_COMMENT) {
+        if (before == null) {
+          if (first == last) {
+            PsiElement firstPsi = SourceTreeToPsiMap.treeElementToPsi(first);
+            PsiElement psiElement = firstPsi instanceof PsiMember ? CodeEditUtil.getDefaultAnchor(psiClass, (PsiMember)firstPsi) : null;
+            anchor = psiElement != null ? SourceTreeToPsiMap.psiElementToTree(psiElement) : null;
+          }
+          else {
+            anchor = findChildByRole(ChildRole.RBRACE);
+          }
+          before = Boolean.TRUE;
+        }
+        else if (!before.booleanValue()) {
+          anchor = findChildByRole(ChildRole.LBRACE);
         }
         else {
           anchor = findChildByRole(ChildRole.RBRACE);
         }
-        before = Boolean.TRUE;
-      }
-      else if (!before.booleanValue()) {
-        anchor = findChildByRole(ChildRole.LBRACE);
-      }
-      else {
-        anchor = findChildByRole(ChildRole.RBRACE);
       }
     }