diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseLibrariesConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseLibrariesConfigurable.java
index 7dd00bb0ad82..17b0ae6c7548 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseLibrariesConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseLibrariesConfigurable.java
@@ -169,7 +169,9 @@ public abstract class BaseLibrariesConfigurable extends BaseStructureConfigurabl
         new LibraryConfigurable(myContext.createModifiableModelProvider(level), library, myContext, TREE_UPDATER);
       final MyNode node = new MyNode(configurable);
       addNode(node, myRoot);
-      myContext.getDaemonAnalyzer().queueUpdate(new LibraryProjectStructureElement(myContext, library));
+      final ProjectStructureDaemonAnalyzer daemonAnalyzer = myContext.getDaemonAnalyzer();
+      daemonAnalyzer.queueUpdate(new LibraryProjectStructureElement(myContext, library));
+      daemonAnalyzer.queueUpdateForAllElementsWithErrors();
     }
   }
 
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryConfigurable.java
index 114754b8fae4..dddcb5840019 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryConfigurable.java
@@ -66,10 +66,9 @@ public class LibraryConfigurable extends ProjectStructureElementConfigurable<Lib
         return getLibraryEditor();
       }
     });
-    final StructureConfigurableContext context = ModuleStructureConfigurable.getInstance(myProject).getContext();
     myLibraryEditorComponent.addListener(new Runnable() {
       public void run() {
-        context.getDaemonAnalyzer().queueUpdate(myProjectStructureElement);
+        myContext.getDaemonAnalyzer().queueUpdate(myProjectStructureElement);
       }
     });
     return myLibraryEditorComponent.getComponent();
@@ -103,6 +102,7 @@ public class LibraryConfigurable extends ProjectStructureElementConfigurable<Lib
   public void setDisplayName(final String name) {
     if (!myUpdatingName) {
       getLibraryEditor().setName(name);
+      myContext.getDaemonAnalyzer().queueUpdateForAllElementsWithErrors();
     }
   }
 
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleConfigurable.java
index 26cbc73fb1e2..32eb19082f02 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleConfigurable.java
@@ -46,6 +46,7 @@ public class ModuleConfigurable extends ProjectStructureElementConfigurable<Modu
   private final ModulesConfigurator myConfigurator;
   private String myModuleName;
   private final ModuleProjectStructureElement myProjectStructureElement;
+  private final StructureConfigurableContext myContext;
 
   public ModuleConfigurable(ModulesConfigurator modulesConfigurator,
                             Module module,
@@ -54,8 +55,8 @@ public class ModuleConfigurable extends ProjectStructureElementConfigurable<Modu
     myModule = module;
     myModuleName = myModule.getName();
     myConfigurator = modulesConfigurator;
-    final StructureConfigurableContext context = ModuleStructureConfigurable.getInstance(myModule.getProject()).getContext();
-    myProjectStructureElement = new ModuleProjectStructureElement(context, myModule);
+    myContext = ModuleStructureConfigurable.getInstance(myModule.getProject()).getContext();
+    myProjectStructureElement = new ModuleProjectStructureElement(myContext, myModule);
   }
 
   public void setDisplayName(String name) {
@@ -72,6 +73,7 @@ public class ModuleConfigurable extends ProjectStructureElementConfigurable<Modu
     myConfigurator.moduleRenamed(myModule, myModuleName, name);
     myModuleName = name;
     myConfigurator.setModified(!Comparing.strEqual(myModuleName, myModule.getName()));
+    myContext.getDaemonAnalyzer().queueUpdateForAllElementsWithErrors();
   }
 
   @Override