diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java
index d9573801302f..17e949ebffe7 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java
@@ -168,7 +168,12 @@ public class ReformatCodeAction extends AnAction implements DumbAware {
     }
 
     if (optimizeImports && range == null) {
-      new ReformatAndOptimizeImportsProcessor(project, file).run();
+      if (file != null || dir == null) {
+        new ReformatAndOptimizeImportsProcessor(project, file).run();
+      }
+      else {
+        new ReformatAndOptimizeImportsProcessor(project, dir, true).run();
+      }
     }
     else {
       new ReformatCodeProcessor(project, file, range).run();