diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SortContentAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SortContentAction.java
index 6393a652e10d..9b6f4fe95a35 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SortContentAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SortContentAction.java
@@ -776,6 +776,12 @@ public class SortContentAction extends PsiElementBaseIntentionAction {
         child = child.getNextSibling();
       }
       sortableList.generate(sb);
+
+      List<SortableEntry> entries = sortableList.myEntries;
+      SortableEntry last = entries.get(entries.size() - 1);
+      if (!last.myBeforeSeparator.isEmpty()) {
+        sb.append("\n");
+      }
       sb.append(")");
       PsiElementFactory factory = JavaPsiFacade.getElementFactory(origin.getProject());
       call.replace(factory.createExpressionFromText(sb.toString(), call));
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/sortContent/afterStringVarargComments2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/sortContent/afterStringVarargComments2.java
new file mode 100644
index 000000000000..b2b1db9b54b4
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/sortContent/afterStringVarargComments2.java
@@ -0,0 +1,16 @@
+// "Sort content" "true"
+
+import java.util.*;
+
+public class Main {
+  private static void foo(String... vararg) {}
+
+  private void test() {
+    foo(
+            "aaa",
+            "bbb",
+
+            "ccc"//comment
+    );
+  }
+}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/sortContent/beforeStringVarargComments2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/sortContent/beforeStringVarargComments2.java
new file mode 100644
index 000000000000..15305d881b0b
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/sortContent/beforeStringVarargComments2.java
@@ -0,0 +1,15 @@
+// "Sort content" "true"
+
+import java.util.*;
+
+public class Main {
+  private static void foo(String... vararg) {}
+
+  private void test() {
+    foo(<caret>
+      "bbb",
+      "ccc"//comment
+      ,
+      "aaa");
+  }
+}