diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameDialog.java b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameDialog.java
index efcd1e1d3811..5e2e09fdafd6 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameDialog.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameDialog.java
@@ -180,10 +180,13 @@ public class RenameDialog extends RefactoringDialog implements RenameRefactoring
     if (initialName != null) {
       result.add(initialName);
     }
-    result.addAll(myPredefinedSuggestedNames);
-    result.add(UsageViewUtil.getShortName(myPsiElement));
     mySuggestedNameInfo = ActionUtil.underModalProgress(myProject, RefactoringBundle.message("progress.title.collecting.suggested.names"),
-                                                        () -> NameSuggestionProvider.suggestNames(myPsiElement, myNameSuggestionContext, result));
+                                                        () -> {
+                                                          result.addAll(myPredefinedSuggestedNames);
+                                                          result.add(UsageViewUtil.getShortName(myPsiElement));
+                                                          return NameSuggestionProvider.suggestNames(myPsiElement, myNameSuggestionContext,
+                                                                                                     result);
+                                                        });
     return ArrayUtilRt.toStringArray(result);
   }