diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/TrailingCommaInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/TrailingCommaInspection.kt
index 9e0355427a7..ba676b58b56 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/TrailingCommaInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/TrailingCommaInspection.kt
@@ -63,9 +63,8 @@ class TrailingCommaInspection(
             }
 
             val last = TrailingCommaHelper.elementAfterLastElement(commaOwner)
-            val whenEntryWithoutTrailingComma =
-                commaOwner is KtWhenEntry && TrailingCommaHelper.trailingCommaOrLastElement(commaOwner)?.isComma != true
-            if (last?.prevLeaf(true)?.isLineBreak() == false && !whenEntryWithoutTrailingComma) {
+
+            if (last?.prevLeaf(true)?.isLineBreak() == false && !allowMissingLineBreak(commaOwner)) {
                 registerProblemForLineBreak(
                     commaOwner,
                     last,
@@ -74,6 +73,11 @@ class TrailingCommaInspection(
             }
         }
 
+        private fun allowMissingLineBreak(commaOwner: KtElement): Boolean {
+            return commaOwner is KtWhenEntry
+                    && TrailingCommaHelper.trailingCommaOrLastElement(commaOwner)?.isComma != true
+        }
+
         private fun checkCommaPosition(commaOwner: KtElement) {
             for (invalidComma in TrailingCommaHelper.findInvalidCommas(commaOwner)) {
                 reportProblem(