diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
index 2943c4751911..ff99b8b80273 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
@@ -703,8 +703,9 @@ public class CodeCompletionHandlerBase {
         assert context.getStartOffset() >= 0 : "stale startOffset: was " + initialStartOffset + "; selEnd=" + caretOffset + "; idEnd=" + idEndOffset + "; file=" + context.getFile();
         assert context.getTailOffset() >= 0 : "stale tail: was " + initialStartOffset + "; selEnd=" + caretOffset + "; idEnd=" + idEndOffset + "; file=" + context.getFile();
 
-        item.handleInsert(context);
         Project project = indicator.getProject();
+        PsiDocumentManager.getInstance(project).commitAllDocuments();
+        item.handleInsert(context);
         PostprocessReformattingAspect.getInstance(project).doPostponedFormatting();
 
         if (context.shouldAddCompletionChar()) {