diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionHandler.kt
index 878ee67e318..ef089ca0775 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionHandler.kt
@@ -85,12 +85,8 @@ class KotlinInlineFunctionHandler: InlineActionHandler() {
                 return
             }
 
-            if (lastReturn != null) {
-                replacementBuilder.prepareCodeToInline(lastReturn.returnedExpression, statements.dropLast(1), ::analyzeBodyCopy)
-            }
-            else {
-                replacementBuilder.prepareCodeToInline(null, statements, ::analyzeBodyCopy)
-            }
+            replacementBuilder.prepareCodeToInline(lastReturn?.returnedExpression,
+                                                   statements.dropLast(returnStatements.size), ::analyzeBodyCopy)
         }
         else {
             replacementBuilder.prepareCodeToInline(bodyCopy, emptyList(), ::analyzeBodyCopy)