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 686a41f0d44b..f0c52e37db39 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
@@ -615,14 +615,10 @@ public class TemplateManagerImpl extends TemplateManager implements Disposable {
 
     Document document = offsetMap.getFile().getViewProvider().getDocument();
     assert document != null;
-    if (replacement.isEmpty() && startOffset == endOffset) {
-      PsiDocumentManager pdm = PsiDocumentManager.getInstance(offsetMap.getFile().getProject());
-      if (ApplicationManager.getApplication().isDispatchThread()) {
-        pdm.commitDocument(document);
-      }
-      if (pdm.isCommitted(document)) {
-        return offsetMap;
-      }
+    if (replacement.isEmpty() &&
+        startOffset == endOffset &&
+        PsiDocumentManager.getInstance(offsetMap.getFile().getProject()).isCommitted(document)) {
+      return offsetMap;
     }
 
     OffsetsInFile hostOffsets = offsetMap.toTopLevelFile();