diff --git a/java/java-impl/src/com/intellij/refactoring/OptimizeImportsRefactoringHelper.java b/java/java-impl/src/com/intellij/refactoring/OptimizeImportsRefactoringHelper.java
index 7ebd200b6a90..b615d96b6693 100644
--- a/java/java-impl/src/com/intellij/refactoring/OptimizeImportsRefactoringHelper.java
+++ b/java/java-impl/src/com/intellij/refactoring/OptimizeImportsRefactoringHelper.java
@@ -48,13 +48,13 @@ public class OptimizeImportsRefactoringHelper implements RefactoringHelper<Set<P
   }
 
   public void performOperation(final Project project, final Set<PsiJavaFile> javaFiles) {
+    PsiDocumentManager.getInstance(project).commitAllDocuments();
     final Set<SmartPsiElementPointer<PsiImportStatementBase>> redundants = new HashSet<SmartPsiElementPointer<PsiImportStatementBase>>();
     final Runnable findRedundantImports = new Runnable() {
       public void run() {
         final JavaCodeStyleManager styleManager = JavaCodeStyleManager.getInstance(project);
         final ProgressIndicator progressIndicator = ProgressManager.getInstance().getProgressIndicator();
         final SmartPointerManager pointerManager = SmartPointerManager.getInstance(project);
-        PsiDocumentManager.getInstance(project).commitAllDocuments();
         for (PsiJavaFile file : javaFiles) {
           if (file.isValid()) {
             final VirtualFile virtualFile = file.getVirtualFile();