diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/RenameElementAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/RenameElementAction.java
index 51046716b486..346465870ecc 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/actions/RenameElementAction.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/actions/RenameElementAction.java
@@ -62,6 +62,6 @@ public class RenameElementAction extends BaseRefactoringAction {
 
   @Override
   protected boolean isAvailableOnElementInEditorAndFile(PsiElement element, Editor editor, PsiFile file, DataContext context) {
-    return getHandler(context) != null;
+    return RenameHandlerRegistry.getInstance().hasAvailableHandler(context);
   }
 }