diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/CreateNewLibraryAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/CreateNewLibraryAction.java
index 414d42d6f6fd..bf9f876e832b 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/CreateNewLibraryAction.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/CreateNewLibraryAction.java
@@ -98,6 +98,7 @@ public class CreateNewLibraryAction extends AnAction {
   private void appendLibraryToModules(final ModuleStructureConfigurable rootConfigurable, final Library libraryToSelect) {
     final List<Module> modules = new ArrayList<Module>();
     ContainerUtil.addAll(modules, rootConfigurable.getModules());
+    if (modules.isEmpty()) return;
     final ChooseModulesDialog dlg = new ChooseModulesDialog(myProject,
                                                             modules, ProjectBundle.message("choose.modules.dialog.title"),
                                                             ProjectBundle