diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/TemplateLineStartEndHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/TemplateLineStartEndHandler.java
index 79dd73bbe2e0..4bae932550d7 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/TemplateLineStartEndHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/TemplateLineStartEndHandler.java
@@ -24,6 +24,7 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.EditorModificationUtil;
 import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
 import com.intellij.openapi.util.TextRange;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public abstract class TemplateLineStartEndHandler extends EditorActionHandler {
@@ -38,13 +39,24 @@ public abstract class TemplateLineStartEndHandler extends EditorActionHandler {
     myWithSelection = withSelection;
   }
 
+  @Override
+  protected boolean isEnabledForCaret(@NotNull Editor editor, @NotNull Caret caret, DataContext dataContext) {
+    TemplateState templateState = TemplateManagerImpl.getTemplateState(editor);
+    if (templateState != null && !templateState.isFinished()) {
+      TextRange range = templateState.getCurrentVariableRange();
+      int caretOffset = editor.getCaretModel().getOffset();
+      if (range != null && range.containsOffset(caretOffset)) return true;
+    }
+    return myOriginalHandler.isEnabled(editor, caret, dataContext);
+  }
+
   @Override
   protected void doExecute(Editor editor, @Nullable Caret caret, DataContext dataContext) {
     final TemplateState templateState = TemplateManagerImpl.getTemplateState(editor);
     if (templateState != null && !templateState.isFinished()) {
       final TextRange range = templateState.getCurrentVariableRange();
       final int caretOffset = editor.getCaretModel().getOffset();
-      if (range != null && range.getStartOffset() <= caretOffset && caretOffset <= range.getEndOffset()) {
+      if (range != null && range.containsOffset(caretOffset)) {
         int selectionOffset = editor.getSelectionModel().getLeadSelectionOffset();
         int offsetToMove = myIsHomeHandler ? range.getStartOffset() : range.getEndOffset();
         editor.getCaretModel().moveToOffset(offsetToMove);