diff --git a/platform/lang-impl/src/com/intellij/refactoring/ui/NameSuggestionsField.java b/platform/lang-impl/src/com/intellij/refactoring/ui/NameSuggestionsField.java
index 5a5c7a5561c9..84fdbe8f1ea0 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/ui/NameSuggestionsField.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/ui/NameSuggestionsField.java
@@ -120,11 +120,10 @@ public class NameSuggestionsField extends JPanel {
 
   public void select(final int start, final int end) {
     SwingUtilities.invokeLater(() -> {
-      Editor editor = getEditor();
-      if (editor == null) return;
-      editor.getSelectionModel().setSelection(start, end);
-      editor.getCaretModel().moveToOffset(end);
-
+      EditorTextField textField = getEditorTextField();
+      if (textField == null) return;
+      textField.select(TextRange.create(start, end));
+      textField.setCaretPosition(end);
     });
   }