diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinLambdaUnwrapper.java b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinLambdaUnwrapper.java
index 38f55a41ba62..f2f72d4a4974 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinLambdaUnwrapper.java
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinLambdaUnwrapper.java
@@ -8,6 +8,8 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.psi.*;
 
+import java.util.List;
+
 public class KotlinLambdaUnwrapper extends KotlinUnwrapRemoveBase {
     public KotlinLambdaUnwrapper(String key) {
         super(key);
@@ -53,4 +55,10 @@ public class KotlinLambdaUnwrapper extends KotlinUnwrapRemoveBase {
         context.extractFromBlock(body, enclosingExpression);
         context.delete(enclosingExpression);
     }
+
+    @Override
+    public PsiElement collectAffectedElements(@NotNull PsiElement e, @NotNull List<PsiElement> toExtract) {
+        super.collectAffectedElements(e, toExtract);
+        return getLambdaEnclosingElement((KtLambdaExpression) e);
+    }
 }