diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
index 11f26ab9ab5b..64cd3ca98676 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
@@ -820,6 +820,8 @@ public class JavaCompletionUtil {
       hasParams = false;
     }
 
+    PsiDocumentManager.getInstance(context.getProject()).commitDocument(context.getDocument());
+
     final CodeStyleSettings styleSettings = CodeStyleSettingsManager.getSettings(context.getProject());
     ParenthesesInsertHandler.getInstance(hasParams,
                                          styleSettings.SPACE_BEFORE_METHOD_CALL_PARENTHESES,
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 40e77b089f77..705b28f13b95 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
@@ -535,7 +535,6 @@ public class CodeCompletionHandlerBase implements CodeInsightActionHandler {
         assert context.getStartOffset() >= 0 : "stale startOffset";
         assert context.getTailOffset() >= 0 : "stale tailOffset";
 
-        PsiDocumentManager.getInstance(indicator.getProject()).commitAllDocuments();
         item.handleInsert(context);
         PostprocessReformattingAspect.getInstance(indicator.getProject()).doPostponedFormatting();