diff --git a/java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/JavadocTypedHandler.java b/java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/JavadocTypedHandler.java
index f0160edd8914..d8d484a0180d 100644
--- a/java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/JavadocTypedHandler.java
+++ b/java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/JavadocTypedHandler.java
@@ -17,7 +17,6 @@ import com.intellij.xml.util.BasicHtmlUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import static com.intellij.psi.impl.source.BasicJavaDocElementType.*;
 import static com.intellij.psi.impl.source.tree.JavaDocElementType.ALL_JAVADOC_ELEMENTS;
 import static com.intellij.util.text.CharArrayUtil.containsOnlyWhiteSpaces;
 
@@ -193,7 +192,8 @@ public final class JavadocTypedHandler extends TypedHandlerDelegate {
 
     ASTNode node = element.getNode();
     return node != null
-           && (JavaDocTokenType.ALL_JAVADOC_TOKENS.contains(node.getElementType()));
+           && (JavaDocTokenType.ALL_JAVADOC_TOKENS.contains(node.getElementType())
+               || ALL_JAVADOC_ELEMENTS.contains(node.getElementType()));
   }
 
   private static boolean isTypeParamBracketClosedAfterParamTag(PsiDocTag tag, int bracketOffset) {
diff --git a/java/java-frontback-psi-api/src/com/intellij/psi/JavaDocTokenType.java b/java/java-frontback-psi-api/src/com/intellij/psi/JavaDocTokenType.java
index 7d184c3c2774..6c612d882477 100644
--- a/java/java-frontback-psi-api/src/com/intellij/psi/JavaDocTokenType.java
+++ b/java/java-frontback-psi-api/src/com/intellij/psi/JavaDocTokenType.java
@@ -44,6 +44,7 @@ public interface JavaDocTokenType {
 
   IElementType DOC_COMMENT_BAD_CHARACTER = new IJavaDocElementType("DOC_COMMENT_BAD_CHARACTER");
 
+  //BASIC_DOC_TAG, BASIC_DOC_INLINE_TAG, BASIC_DOC_METHOD_OR_FIELD_REF, BASIC_DOC_PARAMETER_REF, BASIC_DOC_TAG_VALUE_ELEMENT, BASIC_DOC_REFERENCE_HOLDER, BASIC_DOC_TYPE_HOLDER, BASIC_DOC_COMMENT
   TokenSet ALL_JAVADOC_TOKENS = TokenSet.create(
     DOC_COMMENT_START, DOC_COMMENT_END, DOC_COMMENT_DATA, DOC_SPACE, DOC_COMMENT_LEADING_ASTERISKS, DOC_TAG_NAME,
     DOC_INLINE_TAG_START, DOC_INLINE_TAG_END, DOC_TAG_VALUE_TOKEN, DOC_TAG_VALUE_DOT, DOC_TAG_VALUE_COMMA,