diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutProjectCodeDialog.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutProjectCodeDialog.java
index 57fac81769e8..dd54474fbfd0 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutProjectCodeDialog.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutProjectCodeDialog.java
@@ -108,8 +108,8 @@ public class LayoutProjectCodeDialog extends DialogWrapper implements ReformatFi
     super.doOKAction();
     if (mySuggestOptimizeImports) {
       PropertiesComponent.getInstance().setValue(LayoutCodeConstants.OPTIMIZE_IMPORTS_KEY, Boolean.toString(isOptimizeImports()));
+      LayoutCodeSettingsStorage.saveRearrangeEntriesOptionFor(myProject, isRearrangeEntries());
     }
-    LayoutCodeSettingsStorage.saveRearrangeEntriesOptionFor(myProject, isRearrangeEntries());
   }
 
   public boolean isOptimizeImports() {