diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java
index cbe68b2891bb..1e8ce55785dd 100644
--- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java
+++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java
@@ -59,10 +59,17 @@ public class CopyrightFormattingConfigurable extends SearchableConfigurable.Pare
   }
 
   public JComponent createComponent() {
-    myPanel = new TemplateCommentPanel(null, null, null, myProject);
+    getOrCreateMainPanel();
     return myPanel.createComponent();
   }
 
+  private TemplateCommentPanel getOrCreateMainPanel() {
+    if (myPanel == null) {
+      myPanel = new TemplateCommentPanel(null, null, null, myProject);
+    }
+    return myPanel;
+  }
+
   public boolean isModified() {
     return myPanel.isModified();
   }
@@ -89,7 +96,7 @@ public class CopyrightFormattingConfigurable extends SearchableConfigurable.Pare
     final Configurable[] children = new Configurable[types.length];
     Arrays.sort(types, new FileTypeUtil.SortByName());
     for (int i = 0; i < types.length; i++) {
-      children[i] = FileTypeCopyrightConfigurableFactory.createFileTypeConfigurable(myProject, types[i], myPanel);
+      children[i] = FileTypeCopyrightConfigurableFactory.createFileTypeConfigurable(myProject, types[i], getOrCreateMainPanel());
     }
     return children;
   }