diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/javadoc/JDParser.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/javadoc/JDParser.java
index d996c7ddb1f5..21d0c410cff0 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/javadoc/JDParser.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/javadoc/JDParser.java
@@ -362,7 +362,7 @@ public class JDParser {
         continue;
       }
       while (true) {
-        if (seq.length() < width) {
+        if (seq.length() < width || isMarked) {
           // keep remaining line and proceed with next paragraph
           seq = isMarked ? seq : seq.trim();
           list.add(seq);
diff --git a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavadocFormatterTest.kt b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavadocFormatterTest.kt
index b7633e8c2d70..4602fea2f326 100644
--- a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavadocFormatterTest.kt
+++ b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavadocFormatterTest.kt
@@ -515,7 +515,8 @@ public int method(int parameter) {
     getSettings().WRAP_LONG_LINES = true
 
     doClassTest(
-      """    /**
+      """
+    /**
      * @return <pre>this is a return value documentation with a very long description
      * that is longer than the right margin.</pre>
      */
@@ -523,8 +524,9 @@ public int method(int parameter) {
         return 0;
     }""",
 
-      """/**
- * @return <pre>this is a return value documentation with a very long
+"\n/**\n" +
+" * @return <pre>this is a return value documentation with a very long " +
+"""
  * description
  * that is longer than the right margin.</pre>
  */
@@ -1144,6 +1146,7 @@ interface Test {
      *     class Foo {
      *         private int x;
      *         private int y;
+     *         // The comment inside pre tag which shouldn't be wrapped despite being long
      *     }
      * </pre>
      * @return Some value
@@ -1163,6 +1166,7 @@ interface Test {
      *     class Foo {
      *         private int x;
      *         private int y;
+     *         // The comment inside pre tag which shouldn't be wrapped despite being long
      *     }
      * </pre>
      *