diff --git a/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java
index 3fd4e334a01f..b634f12f5338 100644
--- a/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java
@@ -151,11 +151,12 @@ public class PullUpDialog extends PullUpDialogBase<MemberInfoStorage, MemberInfo
     boolean hasJavadoc = false;
     for (MemberInfo info : myMemberInfos) {
       final PsiMember member = info.getMember();
-      if (myMemberInfoModel.isAbstractEnabled(info) && member instanceof PsiDocCommentOwner) {
+      if (myMemberInfoModel.isAbstractEnabled(info)) {
         info.setToAbstract(myMemberInfoModel.isAbstractWhenDisabled(info));
-        if (((PsiDocCommentOwner)member).getDocComment() != null) {
+        if (!hasJavadoc && 
+            member instanceof PsiDocCommentOwner && 
+            ((PsiDocCommentOwner)member).getDocComment() != null) {
           hasJavadoc = true;
-          break;
         }
       }
     }