diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.form b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.form
index 72e3a1f1fd43..614ba3eebe2e 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.form
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.form
@@ -86,7 +86,7 @@
               <gridbag weightx="1.0" weighty="1.0"/>
             </constraints>
             <properties>
-              <text value="Remove local variable"/>
+              <text value="Remove local &amp;variable"/>
             </properties>
           </component>
           <component id="d4b2" class="javax.swing.JCheckBox" binding="myChangeVarUsages">
@@ -95,7 +95,7 @@
               <gridbag weightx="0.0" weighty="0.0"/>
             </constraints>
             <properties>
-              <text value="Change usages of variable"/>
+              <text value="&amp;Change usages of closure"/>
             </properties>
           </component>
         </children>
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.java
index 73688f9cfc72..5ab54ed23831 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.java
@@ -33,6 +33,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.groovy.GroovyFileType;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrParametersOwner;
+import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariable;
+import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameter;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod;
 import org.jetbrains.plugins.groovy.refactoring.GroovyNameSuggestionUtil;
@@ -95,6 +97,8 @@ public class GrIntroduceParameterDialog extends RefactoringDialog implements GrI
     initReplaceFieldsWithGetters(settings);
 
     myDeclareFinalCheckBox.setSelected(hasFinalModifier());
+    
+    myChangeVarUsages.setVisible(context.toReplaceIn instanceof GrClosableBlock && context.toSearchFor instanceof GrVariable);
 
     setTitle(RefactoringBundle.message("introduce.parameter.title"));
     init();
@@ -151,6 +155,9 @@ public class GrIntroduceParameterDialog extends RefactoringDialog implements GrI
       processor = new GrIntroduceParameterProcessor(settings, myContext);
     }
     else {
+      if (!myChangeVarUsages.isSelected() && myContext.toSearchFor != null) {
+        myContext = new GrIntroduceParameterContext(myContext, myContext.toReplaceIn, null);
+      }
       processor = new GrIntroduceClosureParameterProcessor(settings, myContext);
     }
     invokeRefactoring(processor);