diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/RenameTo.java b/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/RenameTo.java
index b700a27957b6..7df80f0edfa8 100644
--- a/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/RenameTo.java
+++ b/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/RenameTo.java
@@ -107,6 +107,7 @@ public class RenameTo extends ShowSuggestions implements SpellCheckerQuickFix {
         
         DataContext dataContext = SimpleDataContext.getSimpleContext(map, DataManager.getInstance().getDataContext(editor.getComponent()));
         AnAction action = new RenameElementAction();
+        final boolean hadSelection = editor.getSelectionModel().hasSelection();
         final TextRange range = psiElement.getTextRange();
         if (range != null) {
           editor.getSelectionModel().setSelection(range.getStartOffset(), range.getEndOffset());
@@ -116,6 +117,9 @@ public class RenameTo extends ShowSuggestions implements SpellCheckerQuickFix {
         if (provider != null) {
           provider.setActive(false);
         }
+        if (!hadSelection) {
+          editor.getSelectionModel().removeSelection();
+        }
       }
     };