diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureDialog.java
index 419c0749239..7b0653b327e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureDialog.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureDialog.java
@@ -288,7 +288,9 @@ public class JetChangeSignatureDialog extends ChangeSignatureDialogBase<
                                 new ItemListener() {
                                     @Override
                                     public void itemStateChanged(@NotNull ItemEvent e) {
-                                        ((JetFunctionParameterTableModel)myParametersTableModel).setReceiver(item.parameter);
+                                        ((JetFunctionParameterTableModel)myParametersTableModel).setReceiver(
+                                                e.getStateChange() == ItemEvent.SELECTED ? item.parameter : null
+                                        );
                                         updateSignature();
                                         updateNameEditor();
                                     }