diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java
index a9d3397b7869..1335bca1fed6 100644
--- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java
+++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java
@@ -110,13 +110,7 @@ public class AddSupportForFrameworksPanel {
     
     final FrameworkSupportNode selectedNode = getSelectedNode();
     if (!Comparing.equal(selectedNode, myLastSelectedNode)) {
-      if (myLastSelectedNode != null) {
-        final LibraryCompositionOptionsPanel optionsPanel = myLastSelectedNode.getLibraryCompositionOptionsPanel(myLibrariesContainer, myMirrorsMap);
-        if (optionsPanel != null) {
-          optionsPanel.saveSelectedRepositoriesMirrors(myMirrorsMap);
-          optionsPanel.apply();
-        }
-      }
+      applyLibraryOptionsForSelected();
 
       myLastSelectedNode = selectedNode;
       if (selectedNode != null) {
@@ -128,6 +122,16 @@ public class AddSupportForFrameworksPanel {
     }
   }
 
+  private void applyLibraryOptionsForSelected() {
+    if (myLastSelectedNode != null) {
+      final LibraryCompositionOptionsPanel optionsPanel = myLastSelectedNode.getLibraryCompositionOptionsPanel(myLibrariesContainer, myMirrorsMap);
+      if (optionsPanel != null) {
+        optionsPanel.saveSelectedRepositoriesMirrors(myMirrorsMap);
+        optionsPanel.apply();
+      }
+    }
+  }
+
   private void updateOptionsPanel() {
     final FrameworkSupportNode node = getSelectedNode();
     if (node != null) {
@@ -223,6 +227,7 @@ public class AddSupportForFrameworksPanel {
   }
 
   public boolean downloadLibraries() {
+    applyLibraryOptionsForSelected();
     List<LibraryCompositionSettings> list = getLibrariesCompositionSettingsList();
     for (LibraryCompositionSettings compositionSettings : list) {
       if (!compositionSettings.downloadFiles(myMirrorsMap, myLibrariesContainer, myMainPanel)) return false;