diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java
index 0a50b8b6434d..df19186202c9 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java
@@ -122,6 +122,7 @@ public class TemplateManagerImpl extends TemplateManager implements Disposable {
 
   private TemplateState initTemplateState(@NotNull Editor editor) {
     clearTemplateState(editor);
+    PsiDocumentManager.getInstance(myProject).commitDocument(editor.getDocument());
     TemplateState state = new TemplateState(myProject, editor);
     Disposer.register(this, state);
     editor.putUserData(TEMPLATE_STATE_KEY, state);