diff --git a/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java b/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java
index d7d6d37ee529..a704e3cb204b 100644
--- a/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java
+++ b/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java
@@ -350,7 +350,8 @@ public class EntryPointsManagerImpl implements PersistentStateComponent<Element>
 
   @Override
   public void configureAnnotations() {
-    final JPanel listPanel = SpecialAnnotationsUtil.createSpecialAnnotationsListControl(ADDITIONAL_ANNOTATIONS, "Do not check if annotated by", true);
+    final ArrayList<String> list = new ArrayList<String>(ADDITIONAL_ANNOTATIONS);
+    final JPanel listPanel = SpecialAnnotationsUtil.createSpecialAnnotationsListControl(list, "Do not check if annotated by", true);
     new DialogWrapper(myProject) {
       {
         init();
@@ -361,6 +362,13 @@ public class EntryPointsManagerImpl implements PersistentStateComponent<Element>
       protected JComponent createCenterPanel() {
         return listPanel;
       }
+
+      @Override
+      protected void doOKAction() {
+        ADDITIONAL_ANNOTATIONS.clear();
+        ADDITIONAL_ANNOTATIONS.addAll(list);
+        super.doOKAction();
+      }
     }.show();
   }