diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java
index 9c295da30b04..06d812127d6f 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java
@@ -230,9 +230,12 @@ public class RenameProcessor extends BaseRefactoringProcessor {
   }
 
   private boolean findRenamedVariables(final List<UsageInfo> variableUsages) {
-    for (final AutomaticRenamer automaticVariableRenamer : myRenamers) {
+    for (Iterator<AutomaticRenamer> iterator = myRenamers.iterator(); iterator.hasNext(); ) {
+      AutomaticRenamer automaticVariableRenamer = iterator.next();
       if (!automaticVariableRenamer.hasAnythingToRename()) continue;
-      if (!showAutomaticRenamingDialog(automaticVariableRenamer)) return false;
+      if (!showAutomaticRenamingDialog(automaticVariableRenamer)) {
+        iterator.remove();
+      }
     }
 
     final Runnable runnable = new Runnable() {
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
index 4ee59b57d2e1..2349a723232f 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
@@ -241,7 +241,7 @@ public class VariableInplaceRenamer extends InplaceRefactoring {
             if (!ApplicationManager.getApplication().isUnitTestMode()) {
               final AutomaticRenamingDialog renamingDialog = new AutomaticRenamingDialog(myProject, renamer);
               if (!renamingDialog.showAndGet()) {
-                return;
+                continue;
               }
             }