diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java
index d29f1c9bea95..8b613632ca3b 100644
--- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java
+++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java
@@ -279,15 +279,19 @@ public class ProjectSettingsPanel extends PanelWithButtons {
     final List<ScopeSetting> mappings = new ArrayList<ScopeSetting>();
     final Map<String, String> copyrights = myManager.getCopyrightsMapping();
     final DependencyValidationManager manager = DependencyValidationManager.getInstance(myProject);
+    final Set<String> scopes2Unmap = new HashSet<String>();
     for (final String scopeName : copyrights.keySet()) {
       final NamedScope scope = manager.getScope(scopeName);
       if (scope != null) {
         mappings.add(new ScopeSetting(scope, copyrights.get(scopeName)));
       }
       else {
-        myManager.unmapCopyright(scopeName);
+        scopes2Unmap.add(scopeName);
       }
     }
+    for (String scopeName : scopes2Unmap) {
+      myManager.unmapCopyright(scopeName);
+    }
     myScopeMappingModel.setItems(mappings);
     updateButtons();
   }