diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/result/FindTransformationMatcher.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/result/FindTransformationMatcher.kt
index 25a5db388ad..7d2c4f152b4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/result/FindTransformationMatcher.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/result/FindTransformationMatcher.kt
@@ -256,7 +256,7 @@ object FindTransformationMatcher : TransformationMatcher {
                 return object : FindOperationGenerator(this) {
                     override fun generate(chainedCallGenerator: ChainedCallGenerator): KtExpression {
                         val generated = this@useElvisOperatorIfNeeded.generate(chainedCallGenerator)
-                        return KtPsiFactory(generated).createExpressionByPattern("$0 ?: $1", generated, valueIfNotFound)
+                        return KtPsiFactory(generated).createExpressionByPattern("$0\n ?: $1", generated, valueIfNotFound)
                     }
                 }
             }
diff --git a/idea/testData/intentions/loopToCallChain/firstOrNull_letOrNotNull.kt.after b/idea/testData/intentions/loopToCallChain/firstOrNull_letOrNotNull.kt.after
index c5504673d4e..922b0538b99 100644
--- a/idea/testData/intentions/loopToCallChain/firstOrNull_letOrNotNull.kt.after
+++ b/idea/testData/intentions/loopToCallChain/firstOrNull_letOrNotNull.kt.after
@@ -3,7 +3,8 @@
 fun foo(list: List<String>) {
     val <caret>result = list
             .firstOrNull { it.length > 0 }
-            ?.let { bar(it) } ?: ""
+            ?.let { bar(it) }
+            ?: ""
 }
 
 fun bar(s: String): String = s
diff --git a/idea/testData/intentions/loopToCallChain/firstOrNull_returnExpressionOrNotNull.kt.after b/idea/testData/intentions/loopToCallChain/firstOrNull_returnExpressionOrNotNull.kt.after
index a77bef0eddf..2a2a6190456 100644
--- a/idea/testData/intentions/loopToCallChain/firstOrNull_returnExpressionOrNotNull.kt.after
+++ b/idea/testData/intentions/loopToCallChain/firstOrNull_returnExpressionOrNotNull.kt.after
@@ -3,5 +3,6 @@
 fun foo(list: List<String>): Int {
     <caret>return list
             .firstOrNull { it.isNotEmpty() }
-            ?.length ?: -1
+            ?.length
+            ?: -1
 }
\ No newline at end of file
diff --git a/idea/testData/intentions/loopToCallChain/firstOrNull_returnNotNullIfNone.kt.after b/idea/testData/intentions/loopToCallChain/firstOrNull_returnNotNullIfNone.kt.after
index e993548be15..b5bc722fcd2 100644
--- a/idea/testData/intentions/loopToCallChain/firstOrNull_returnNotNullIfNone.kt.after
+++ b/idea/testData/intentions/loopToCallChain/firstOrNull_returnNotNullIfNone.kt.after
@@ -1,5 +1,6 @@
 // WITH_RUNTIME
 // INTENTION_TEXT: "Replace with 'firstOrNull{}'"
 fun foo(list: List<String>): String {
-    <caret>return list.firstOrNull { it.isNotEmpty() } ?: ""
+    <caret>return list.firstOrNull { it.isNotEmpty() }
+            ?: ""
 }
\ No newline at end of file