diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/HomeEndHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/HomeEndHandler.java
index c43fbca6a9f5..3aa182dab758 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/HomeEndHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/HomeEndHandler.java
@@ -41,8 +41,8 @@ public abstract class HomeEndHandler extends EditorActionHandler {
         int offsetToMove = myIsHomeHandler ? range.getStartOffset() : range.getEndOffset();
         if (offsetToMove != caretOffset) {
           editor.getCaretModel().moveToOffset(offsetToMove);
-          editor.getSelectionModel().removeSelection();
         }
+        editor.getSelectionModel().removeSelection();
       } else {
         myOriginalHandler.execute(editor, dataContext);
       }