diff --git a/source/com/intellij/refactoring/rename/RenameDialog.java b/source/com/intellij/refactoring/rename/RenameDialog.java
index e0ec9ef9f6e1..2586fda1ec18 100644
--- a/source/com/intellij/refactoring/rename/RenameDialog.java
+++ b/source/com/intellij/refactoring/rename/RenameDialog.java
@@ -269,7 +269,7 @@ public class RenameDialog extends RefactoringDialog {
   }
 
   public JComponent getPreferredFocusedComponent() {
-    return myNameSuggestionsField.getEditor().getComponent();
+    return myNameSuggestionsField.getComponent();
   }
 
   protected JComponent createCenterPanel() {