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 16db0d4a3c5c..4020c8fc5cae 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameDialog.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameDialog.java
@@ -326,13 +326,13 @@ public class RenameDialog extends RefactoringDialog {
   @Override
   protected void canRun() throws ConfigurationException {
     if (Comparing.strEqual(getNewName(), myOldName)) throw new ConfigurationException(null);
-    final Function<String, String> inputValidator = RenameInputValidatorRegistry.getInputErrorValidator(myPsiElement);
-    if (inputValidator != null) {
-      throw new ConfigurationException(inputValidator.fun(getNewName()));
-    }
     if (!areButtonsValid()) {
       throw new ConfigurationException("\'" + getNewName() + "\' is not a valid identifier");
     }
+    final Function<String, String> inputValidator = RenameInputValidatorRegistry.getInputErrorValidator(myPsiElement);
+    if (inputValidator != null) {
+      setErrorText(inputValidator.fun(getNewName()));
+    }
   }
 
   @Override