diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetFunctionParameterTableModel.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetFunctionParameterTableModel.java
index 2663e5a5c42..b3dff394552 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetFunctionParameterTableModel.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetFunctionParameterTableModel.java
@@ -39,6 +39,14 @@ public class JetFunctionParameterTableModel extends JetCallableParameterTableMod
               new ReceiverColumn(context.getProject(), methodDescriptor));
     }
 
+    @Override
+    public void removeRow(int idx) {
+        if (getRowValue(idx).parameter == getReceiver()) {
+            setReceiver(null);
+        }
+        super.removeRow(idx);
+    }
+
     @Override
     @Nullable
     public JetParameterInfo getReceiver() {