diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorContextImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorContextImpl.java
index b8c7328b1ac5..c0cae5f5ccf8 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorContextImpl.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorContextImpl.java
@@ -108,7 +108,8 @@ public class ArtifactEditorContextImpl implements ArtifactEditorContext {
         for (OrderEntry entry : rootModel.getOrderEntries()) {
           if (entry instanceof ModuleLibraryOrderEntryImpl) {
             final ModuleLibraryOrderEntryImpl libraryEntry = (ModuleLibraryOrderEntryImpl)entry;
-            if (libraryName.equals(libraryEntry.getLibraryName())) {
+            if (libraryName != null && libraryName.equals(libraryEntry.getLibraryName())
+               || libraryName == null && library.equals(libraryEntry.getLibrary())) {
               ModuleStructureConfigurable.getInstance(getProject()).selectOrderEntry(module, libraryEntry);
               return;
             }