diff --git a/src/main/java/net/sf/jabref/gui/EntryCustomizationDialog2.java b/src/main/java/net/sf/jabref/gui/EntryCustomizationDialog.java
similarity index 98%
rename from src/main/java/net/sf/jabref/gui/EntryCustomizationDialog2.java
rename to src/main/java/net/sf/jabref/gui/EntryCustomizationDialog.java
index 0b257c5dccf..e032830bbe1 100644
--- a/src/main/java/net/sf/jabref/gui/EntryCustomizationDialog2.java
+++ b/src/main/java/net/sf/jabref/gui/EntryCustomizationDialog.java
@@ -35,7 +35,7 @@
 import net.sf.jabref.logic.l10n.Localization;
 import net.sf.jabref.model.entry.*;
 
-public class EntryCustomizationDialog2 extends JDialog implements ListSelectionListener, ActionListener {
+public class EntryCustomizationDialog extends JDialog implements ListSelectionListener, ActionListener {
 
     private final JabRefFrame frame;
     protected GridBagLayout gbl = new GridBagLayout();
@@ -63,9 +63,9 @@ public class EntryCustomizationDialog2 extends JDialog implements ListSelectionL
 
 
     /**
-     * Creates a new instance of EntryCustomizationDialog2
+     * Creates a new instance of EntryCustomizationDialog
      */
-    public EntryCustomizationDialog2(JabRefFrame frame) {
+    public EntryCustomizationDialog(JabRefFrame frame) {
         super(frame, Localization.lang("Customize entry types"), false);
 
         this.frame = frame;
@@ -236,7 +236,7 @@ private void applyChanges() {
             List<String> optStr = optLists.get(stringListEntry.getKey());
             List<String> opt2Str = opt2Lists.get(stringListEntry.getKey());
 
-            if (opt2Str != null) {
+            if (opt2Str == null) {
                 opt2Str = new ArrayList<>(0);
             }
 
diff --git a/src/main/java/net/sf/jabref/gui/EntryTypeList.java b/src/main/java/net/sf/jabref/gui/EntryTypeList.java
index acbe8cf6671..c6ecb6132bb 100644
--- a/src/main/java/net/sf/jabref/gui/EntryTypeList.java
+++ b/src/main/java/net/sf/jabref/gui/EntryTypeList.java
@@ -33,7 +33,7 @@
 
 /**
  * This class extends FieldSetComponent to provide some required functionality for the
- * list of entry types in EntryCustomizationDialog2.
+ * list of entry types in EntryCustomizationDialog.
  * @author alver
  */
 public class EntryTypeList extends FieldSetComponent implements ListSelectionListener {
diff --git a/src/main/java/net/sf/jabref/gui/JabRefFrame.java b/src/main/java/net/sf/jabref/gui/JabRefFrame.java
index 36b8dd0120f..ddfde1c0ff7 100644
--- a/src/main/java/net/sf/jabref/gui/JabRefFrame.java
+++ b/src/main/java/net/sf/jabref/gui/JabRefFrame.java
@@ -1932,7 +1932,7 @@ public CustomizeEntryTypeAction() {
 
         @Override
         public void actionPerformed(ActionEvent e) {
-            JDialog dl = new EntryCustomizationDialog2(JabRefFrame.this);
+            JDialog dl = new EntryCustomizationDialog(JabRefFrame.this);
             PositionWindow.placeDialog(dl, JabRefFrame.this);
             dl.setVisible(true);
         }