diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SmartEnterAction.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SmartEnterAction.java
index 19fb28086099..436fc3099378 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SmartEnterAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SmartEnterAction.java
@@ -18,6 +18,8 @@ package com.intellij.codeInsight.editorActions.smartEnter;
 
 import com.intellij.codeInsight.editorActions.enter.EnterAfterUnmatchedBraceHandler;
 import com.intellij.codeInsight.lookup.LookupManager;
+import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
+import com.intellij.codeInsight.template.impl.TemplateState;
 import com.intellij.lang.Language;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.actionSystem.DataContext;
@@ -64,6 +66,11 @@ public class SmartEnterAction extends EditorAction {
 
       LookupManager.getInstance(project).hideActiveLookup();
 
+      TemplateState state = TemplateManagerImpl.getTemplateState(editor);
+      if (state != null) {
+        state.gotoEnd();
+      }
+
       final int caretOffset = editor.getCaretModel().getOffset();
 
       PsiFile psiFile = PsiUtilBase.getPsiFileInEditor(editor, project);