diff --git a/src/main/java/org/jabref/gui/EntryTypeDialog.java b/src/main/java/org/jabref/gui/EntryTypeDialog.java
index 5a0f7eb7b8a..f99d386690e 100644
--- a/src/main/java/org/jabref/gui/EntryTypeDialog.java
+++ b/src/main/java/org/jabref/gui/EntryTypeDialog.java
@@ -116,7 +116,7 @@ private JPanel createCancelButtonBarPanel() {
         cancel.addActionListener(this);
 
         // Make ESC close dialog, equivalent to clicking Cancel.
-        cancel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        cancel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         cancel.getActionMap().put("close", cancelAction);
 
         JPanel buttons = new JPanel();
diff --git a/src/main/java/org/jabref/gui/FXDialog.java b/src/main/java/org/jabref/gui/FXDialog.java
index 33d766201e3..e577568267a 100644
--- a/src/main/java/org/jabref/gui/FXDialog.java
+++ b/src/main/java/org/jabref/gui/FXDialog.java
@@ -60,7 +60,7 @@ public FXDialog(AlertType type, boolean isModal) {
 
         dialogWindow.getScene().setOnKeyPressed(event -> {
             KeyBindingRepository keyBindingRepository = Globals.getKeyPrefs();
-            if (keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLOSE_DIALOG, event)) {
+            if (keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLOSE, event)) {
                 dialogWindow.close();
             }
         });
diff --git a/src/main/java/org/jabref/gui/GenFieldsCustomizer.java b/src/main/java/org/jabref/gui/GenFieldsCustomizer.java
index 4d2fc236d93..6bff3e65d56 100644
--- a/src/main/java/org/jabref/gui/GenFieldsCustomizer.java
+++ b/src/main/java/org/jabref/gui/GenFieldsCustomizer.java
@@ -97,7 +97,7 @@ private void jbInit() {
         // Key bindings:
         ActionMap am = buttons.getActionMap();
         InputMap im = buttons.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", new AbstractAction() {
 
             @Override
diff --git a/src/main/java/org/jabref/gui/MergeDialog.java b/src/main/java/org/jabref/gui/MergeDialog.java
index 3148e9ecc6d..b843419c624 100644
--- a/src/main/java/org/jabref/gui/MergeDialog.java
+++ b/src/main/java/org/jabref/gui/MergeDialog.java
@@ -91,7 +91,7 @@ private void jbInit() {
         // Key bindings:
         ActionMap am = jPanel1.getActionMap();
         InputMap im = jPanel1.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", new AbstractAction() {
 
             @Override
diff --git a/src/main/java/org/jabref/gui/PreviewPanel.java b/src/main/java/org/jabref/gui/PreviewPanel.java
index b27d5ce37c9..d2b1fd8c118 100644
--- a/src/main/java/org/jabref/gui/PreviewPanel.java
+++ b/src/main/java/org/jabref/gui/PreviewPanel.java
@@ -113,7 +113,7 @@ private void createKeyBindings() {
                         copyPreviewToClipBoard();
                         event.consume();
                         break;
-                    case CLOSE_DIALOG:
+                    case CLOSE:
                         close();
                         event.consume();
                         break;
diff --git a/src/main/java/org/jabref/gui/ReplaceStringDialog.java b/src/main/java/org/jabref/gui/ReplaceStringDialog.java
index 6d3e6fec37f..10fd5ccc1cf 100644
--- a/src/main/java/org/jabref/gui/ReplaceStringDialog.java
+++ b/src/main/java/org/jabref/gui/ReplaceStringDialog.java
@@ -81,7 +81,7 @@ public void actionPerformed(ActionEvent e) {
         JPanel settings = new JPanel();
         ActionMap am = settings.getActionMap();
         InputMap im = settings.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", cancelAction);
 
         // Layout starts here.
diff --git a/src/main/java/org/jabref/gui/StringDialog.java b/src/main/java/org/jabref/gui/StringDialog.java
index 2cd2de31306..796a557dbec 100644
--- a/src/main/java/org/jabref/gui/StringDialog.java
+++ b/src/main/java/org/jabref/gui/StringDialog.java
@@ -120,7 +120,7 @@ protected boolean accept(Component c) {
         am.put("remove", removeStringAction);
         im.put(Globals.getKeyPrefs().getKey(KeyBinding.SAVE_DATABASE), "save");
         am.put("save", saveAction);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", closeAction);
         im.put(Globals.getKeyPrefs().getKey(KeyBinding.HELP), "help");
         am.put("help", helpAction);
@@ -218,7 +218,7 @@ public StringTable(StringTableModel stm) {
             TableColumnModel cm = getColumnModel();
             cm.getColumn(0).setPreferredWidth(800);
             cm.getColumn(1).setPreferredWidth(2000);
-            getInputMap().put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+            getInputMap().put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
             getActionMap().put("close", closeAction);
             getInputMap().put(Globals.getKeyPrefs().getKey(KeyBinding.HELP), "help");
             getActionMap().put("help", helpAction);
diff --git a/src/main/java/org/jabref/gui/actions/ManageKeywordsAction.java b/src/main/java/org/jabref/gui/actions/ManageKeywordsAction.java
index dbb2f7beed6..0af7a02f91c 100644
--- a/src/main/java/org/jabref/gui/actions/ManageKeywordsAction.java
+++ b/src/main/java/org/jabref/gui/actions/ManageKeywordsAction.java
@@ -197,7 +197,7 @@ public void keyPressed(KeyEvent e) {
         // Key bindings:
         ActionMap am = builder.getPanel().getActionMap();
         InputMap im = builder.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", cancelAction);
 
         diag.getContentPane().add(builder.getPanel(), BorderLayout.CENTER);
diff --git a/src/main/java/org/jabref/gui/actions/MassSetFieldAction.java b/src/main/java/org/jabref/gui/actions/MassSetFieldAction.java
index 2d6e2a907db..953d420d024 100644
--- a/src/main/java/org/jabref/gui/actions/MassSetFieldAction.java
+++ b/src/main/java/org/jabref/gui/actions/MassSetFieldAction.java
@@ -189,7 +189,7 @@ public void actionPerformed(ActionEvent e) {
         // Key bindings:
         ActionMap am = builder.getPanel().getActionMap();
         InputMap im = builder.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", cancelAction);
     }
 
diff --git a/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java b/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java
index 7e879d1a36f..22a65babf34 100644
--- a/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java
+++ b/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java
@@ -132,7 +132,7 @@ private void jbInit() {
         // Key bindings:
         ActionMap am = statusPanel.getActionMap();
         InputMap im = statusPanel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", new AbstractAction() {
 
             @Override
diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java b/src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java
index 3a36c4f686e..e4ecee93456 100644
--- a/src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java
+++ b/src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java
@@ -104,7 +104,7 @@ public void actionPerformed(ActionEvent e) {
 
         ActionMap am = b.getPanel().getActionMap();
         InputMap im = b.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", closeAction);
     }
 
diff --git a/src/main/java/org/jabref/gui/customentrytypes/EntryCustomizationDialog.java b/src/main/java/org/jabref/gui/customentrytypes/EntryCustomizationDialog.java
index 6fa48081af5..9c7e8375f60 100644
--- a/src/main/java/org/jabref/gui/customentrytypes/EntryCustomizationDialog.java
+++ b/src/main/java/org/jabref/gui/customentrytypes/EntryCustomizationDialog.java
@@ -156,7 +156,7 @@ public void actionPerformed(ActionEvent e) {
         };
         ActionMap am = main.getActionMap();
         InputMap im = main.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", closeAction);
 
         //con.fill = GridBagConstraints.BOTH;
diff --git a/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java b/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java
index ab91d923c27..c51d1626a6f 100644
--- a/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java
+++ b/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java
@@ -163,7 +163,7 @@ public void actionPerformed(ActionEvent e) {
         };
         ActionMap am = builder.getPanel().getActionMap();
         InputMap im = builder.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", closeAction);
 
         ok.addActionListener(e -> {
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 6815e809872..af629931f41 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -127,7 +127,7 @@ private void setupKeyBindings() {
                         HelpAction.openHelpPage(HelpFile.ENTRY_EDITOR);
                         event.consume();
                         break;
-                    case CLOSE_ENTRY_EDITOR:
+                    case CLOSE:
                         close();
                         event.consume();
                         break;
diff --git a/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java b/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java
index b869ee8d8b2..fb08512a5a1 100644
--- a/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java
+++ b/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java
@@ -112,7 +112,7 @@ public void actionPerformed(ActionEvent e) {
         JPanel main = new JPanel();
         ActionMap am = main.getActionMap();
         InputMap im = main.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", cancelAction);
 
         // Layout starts here.
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java
index e6158243ca8..b2b13d72b1d 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java
@@ -136,7 +136,7 @@ public void actionPerformed(ActionEvent e) {
         JPanel main = new JPanel();
         ActionMap am = main.getActionMap();
         InputMap im = main.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", closeAction);
         main.setLayout(new BorderLayout());
         main.add(sp, BorderLayout.CENTER);
diff --git a/src/main/java/org/jabref/gui/externalfiles/WriteXMPActionWorker.java b/src/main/java/org/jabref/gui/externalfiles/WriteXMPActionWorker.java
index 52e6d6d2442..3454f6e4cfd 100644
--- a/src/main/java/org/jabref/gui/externalfiles/WriteXMPActionWorker.java
+++ b/src/main/java/org/jabref/gui/externalfiles/WriteXMPActionWorker.java
@@ -205,7 +205,7 @@ public void actionPerformed(ActionEvent e) {
 
             InputMap im = cancelButton.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
             ActionMap am = cancelButton.getActionMap();
-            im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+            im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
             am.put("close", cancel);
 
             progressArea = new JTextArea(15, 60);
diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEditor.java b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEditor.java
index a8c3d6f1409..b2ad366d2ed 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEditor.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEditor.java
@@ -194,11 +194,11 @@ public void actionPerformed(ActionEvent e) {
         // Key bindings:
         ActionMap am = upper.getActionMap();
         InputMap im = upper.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", cancelAction);
         am = bb.getPanel().getActionMap();
         im = bb.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", cancelAction);
 
         if (frame == null) {
diff --git a/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java b/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
index e0f3ebf2680..d63e6e6f964 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
@@ -211,7 +211,7 @@ public void actionPerformed(ActionEvent e) {
         // Key bindings:
         ActionMap am = builder.getPanel().getActionMap();
         InputMap im = builder.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", cancelAction);
 
         link.getDocument().addDocumentListener(new DocumentListener() {
diff --git a/src/main/java/org/jabref/gui/groups/GroupAddRemoveDialog.java b/src/main/java/org/jabref/gui/groups/GroupAddRemoveDialog.java
index 6497cdd0db4..9cfc6d32bef 100644
--- a/src/main/java/org/jabref/gui/groups/GroupAddRemoveDialog.java
+++ b/src/main/java/org/jabref/gui/groups/GroupAddRemoveDialog.java
@@ -109,7 +109,7 @@ public void action() throws Exception {
         // Key bindings:
         ActionMap am = sp.getActionMap();
         InputMap im = sp.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", new AbstractAction() {
 
             @Override
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialog.java b/src/main/java/org/jabref/gui/groups/GroupDialog.java
index fb743b8c4c0..4abd8d6ac83 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialog.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialog.java
@@ -348,7 +348,7 @@ public void actionPerformed(ActionEvent e) {
         };
         mCancel.addActionListener(cancelAction);
         builderAll.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
-                .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+                  .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         builderAll.getPanel().getActionMap().put("close", cancelAction);
 
         okButton.addActionListener(e -> {
diff --git a/src/main/java/org/jabref/gui/importer/FetcherPreviewDialog.java b/src/main/java/org/jabref/gui/importer/FetcherPreviewDialog.java
index 814de298e21..5559830dde4 100644
--- a/src/main/java/org/jabref/gui/importer/FetcherPreviewDialog.java
+++ b/src/main/java/org/jabref/gui/importer/FetcherPreviewDialog.java
@@ -113,7 +113,7 @@ public void actionPerformed(ActionEvent e) {
         };
         ActionMap am = centerPan.getActionMap();
         InputMap im = centerPan.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", closeAction);
 
         pack();
diff --git a/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java b/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java
index 04ea80df041..2626933ae89 100644
--- a/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java
@@ -193,7 +193,7 @@ public void actionPerformed(ActionEvent e) {
         JPanel mainPanel = new JPanel();
         ActionMap am = mainPanel.getActionMap();
         InputMap im = mainPanel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", closeAction);
         mainPanel.setLayout(new BorderLayout());
         mainPanel.add(sp, BorderLayout.CENTER);
diff --git a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
index c9730d463ff..21f3bd6167a 100644
--- a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
@@ -340,7 +340,7 @@ public void actionPerformed(ActionEvent e) {
         };
         ActionMap am = contentPane.getActionMap();
         InputMap im = contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", closeAction);
 
     }
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBinder.java b/src/main/java/org/jabref/gui/keyboard/KeyBinder.java
index b1a40c2a112..1944bd038cd 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBinder.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBinder.java
@@ -22,7 +22,7 @@ private KeyBinder() {
     public static void bindCloseDialogKeyToCancelAction(JRootPane rootPane, Action cancelAction) {
         InputMap im = rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
         ActionMap am = rootPane.getActionMap();
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", cancelAction);
     }
 
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
index e5adbad4de3..72e498151bb 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
@@ -11,8 +11,7 @@ public enum KeyBinding {
     CHECK_INTEGRITY("Check integrity", Localization.menuTitle("Check integrity"), "ctrl+F8", KeyBindingCategory.QUALITY),
     CLEANUP("Cleanup", Localization.lang("Cleanup entries"), "alt+F8", KeyBindingCategory.QUALITY),
     CLOSE_DATABASE("Close library", Localization.lang("Close library"), "ctrl+W", KeyBindingCategory.FILE),
-    CLOSE_DIALOG("Close dialog", Localization.lang("Close dialog"), "ESCAPE", KeyBindingCategory.FILE),
-    CLOSE_ENTRY_EDITOR("Close entry editor", Localization.lang("Close entry editor"), "Esc", KeyBindingCategory.VIEW),
+    CLOSE("Close dialog", Localization.lang("Close dialog"), "Esc", KeyBindingCategory.VIEW),
     COPY("Copy", Localization.lang("Copy"), "ctrl+C", KeyBindingCategory.EDIT),
     COPY_TITLE("Copy title", Localization.lang("Copy title"), "ctrl+shift+alt+T", KeyBindingCategory.EDIT),
     COPY_CITE_BIBTEX_KEY("Copy \\cite{BibTeX key}", Localization.lang("Copy \\cite{BibTeX key}"), "ctrl+K", KeyBindingCategory.EDIT),
@@ -87,8 +86,7 @@ public enum KeyBinding {
     UNABBREVIATE("Unabbreviate", Localization.lang("Unabbreviate"), "ctrl+alt+shift+A", KeyBindingCategory.TOOLS),
     UNDO("Undo", Localization.lang("Undo"), "ctrl+Z", KeyBindingCategory.EDIT),
     WEB_SEARCH("Web search", Localization.lang("Web search"), "alt+4", KeyBindingCategory.SEARCH),
-    WRITE_XMP("Write XMP", Localization.lang("Write XMP"), "F6", KeyBindingCategory.TOOLS),
-    CLEAR_SEARCH("Clear search", Localization.lang("Clear search"), "ESC", KeyBindingCategory.SEARCH);
+    WRITE_XMP("Write XMP", Localization.lang("Write XMP"), "F6", KeyBindingCategory.TOOLS);
 
     private final String constant;
     private final String localization;
diff --git a/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.java b/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.java
index 4b920f36c61..2a2d48ef26e 100644
--- a/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.java
+++ b/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.java
@@ -89,7 +89,7 @@ public void actionPerformed(ActionEvent actionEvent) {
         };
         cancel.addActionListener(cancelAction);
         builder.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
-                .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+               .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         builder.getPanel().getActionMap().put("close", cancelAction);
 
     }
diff --git a/src/main/java/org/jabref/gui/openoffice/CitationManager.java b/src/main/java/org/jabref/gui/openoffice/CitationManager.java
index fe69d79f67e..98f6440ba6a 100644
--- a/src/main/java/org/jabref/gui/openoffice/CitationManager.java
+++ b/src/main/java/org/jabref/gui/openoffice/CitationManager.java
@@ -110,7 +110,7 @@ public void actionPerformed(ActionEvent actionEvent) {
         cancel.addActionListener(cancelAction);
 
         bb.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put
-                (Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+                (Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         bb.getPanel().getActionMap().put("close", cancelAction);
 
         table.getColumnModel().getColumn(0).setPreferredWidth(580);
@@ -225,7 +225,7 @@ public void actionPerformed(ActionEvent actionEvent) {
             cancelButton.addActionListener(cancelAction);
 
             builder.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put
-                    (Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+                    (Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
             builder.getPanel().getActionMap().put("close", cancelAction);
 
         }
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
index b3dd612cd62..a6e8479e67f 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
@@ -192,7 +192,7 @@ public void actionPerformed(ActionEvent event) {
 
         ActionMap am = bb.getPanel().getActionMap();
         InputMap im = bb.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", cancelListener);
         im.put(KeyStroke.getKeyStroke("ENTER"), "enterOk");
         am.put("enterOk", okListener);
@@ -514,7 +514,7 @@ public void actionPerformed(ActionEvent e) {
             // Key bindings:
             bb.getPanel()
               .getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
-              .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+              .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
             bb.getPanel().getActionMap().put("close", cancelAction);
             pack();
             setLocationRelativeTo(diag);
diff --git a/src/main/java/org/jabref/gui/plaintextimport/TextInputDialog.java b/src/main/java/org/jabref/gui/plaintextimport/TextInputDialog.java
index 23677be4ac2..e542d88dd5e 100644
--- a/src/main/java/org/jabref/gui/plaintextimport/TextInputDialog.java
+++ b/src/main/java/org/jabref/gui/plaintextimport/TextInputDialog.java
@@ -174,7 +174,7 @@ private void jbInit() {
         // Key bindings:
         ActionMap am = buttons.getActionMap();
         InputMap im = buttons.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", new AbstractAction() {
 
             @Override
diff --git a/src/main/java/org/jabref/gui/protectedterms/NewProtectedTermsFileDialog.java b/src/main/java/org/jabref/gui/protectedterms/NewProtectedTermsFileDialog.java
index c546df15777..e44dcdd98e0 100644
--- a/src/main/java/org/jabref/gui/protectedterms/NewProtectedTermsFileDialog.java
+++ b/src/main/java/org/jabref/gui/protectedterms/NewProtectedTermsFileDialog.java
@@ -111,7 +111,7 @@ public void actionPerformed(ActionEvent e) {
 
         // Key bindings:
         bb.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
-                .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+          .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         bb.getPanel().getActionMap().put("close", cancelAction);
         pack();
     }
diff --git a/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java b/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java
index 4e129975fb0..321d910ddfe 100644
--- a/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java
+++ b/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java
@@ -163,7 +163,7 @@ public void actionPerformed(ActionEvent event) {
 
         ActionMap am = bb.getPanel().getActionMap();
         InputMap im = bb.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", cancelListener);
         im.put(KeyStroke.getKeyStroke("ENTER"), "enterOk");
         am.put("enterOk", okListener);
@@ -468,7 +468,7 @@ public void actionPerformed(ActionEvent e) {
 
             // Key bindings:
             bb.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
-                    .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+              .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
             bb.getPanel().getActionMap().put("close", cancelAction);
             pack();
             setLocationRelativeTo(diag);
diff --git a/src/main/java/org/jabref/gui/push/PushToApplicationSettingsDialog.java b/src/main/java/org/jabref/gui/push/PushToApplicationSettingsDialog.java
index 598c6327fd7..ec52a2b2d36 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplicationSettingsDialog.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplicationSettingsDialog.java
@@ -43,7 +43,7 @@ public static void showSettingsDialog(JFrame parent, PushToApplication toApp, JP
         // Key bindings:
         ActionMap am = bb.getPanel().getActionMap();
         InputMap im = bb.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         am.put("close", new AbstractAction() {
 
             @Override
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
index 2e2405c7383..045b3fc19df 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
@@ -139,7 +139,7 @@ public void actionPerformed(ActionEvent e) {
                     updateOpenCurrentResultsTooltip(globalSearch.isSelected());
                     focus();
                     event.consume();
-                } else if (keyBinding.get().equals(KeyBinding.CLEAR_SEARCH)) {
+                } else if (keyBinding.get().equals(KeyBinding.CLOSE)) {
                     // Clear search and select first entry, if available
                     clearSearch();
                     frame.getCurrentBasePanel().getMainTable().getSelectionModel().selectFirst();
diff --git a/src/main/java/org/jabref/gui/search/SearchResultFrame.java b/src/main/java/org/jabref/gui/search/SearchResultFrame.java
index 00f6bf775f1..59e9a8ccb6a 100644
--- a/src/main/java/org/jabref/gui/search/SearchResultFrame.java
+++ b/src/main/java/org/jabref/gui/search/SearchResultFrame.java
@@ -164,7 +164,7 @@ public void actionPerformed(ActionEvent e) {
 
         ActionMap actionMap = contentPane.getActionMap();
         InputMap inputMap = contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        inputMap.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+        inputMap.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
         inputMap.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DATABASE), "close");
         actionMap.put("close", closeAction);
 
diff --git a/src/main/java/org/jabref/gui/util/BaseDialog.java b/src/main/java/org/jabref/gui/util/BaseDialog.java
index e5e680318a8..98bb1f7ae15 100644
--- a/src/main/java/org/jabref/gui/util/BaseDialog.java
+++ b/src/main/java/org/jabref/gui/util/BaseDialog.java
@@ -14,7 +14,7 @@ public class BaseDialog<T> extends Dialog<T> {
     protected BaseDialog() {
         getDialogPane().getScene().setOnKeyPressed(event -> {
             KeyBindingRepository keyBindingRepository = Globals.getKeyPrefs();
-            if (keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLOSE_DIALOG, event)) {
+            if (keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLOSE, event)) {
                 close();
             }
         });
diff --git a/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java b/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java
index 7b423d42ae0..7878cb9c678 100644
--- a/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java
+++ b/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java
@@ -145,16 +145,16 @@ public void testSetAllKeyBindingsToDefault() {
 
     @Test
     public void testCloseEntryEditorCloseEntryKeybinding() {
-        KeyBindingViewModel viewModel = setKeyBindingViewModel(KeyBinding.CLOSE_ENTRY_EDITOR);
+        KeyBindingViewModel viewModel = setKeyBindingViewModel(KeyBinding.CLOSE);
         model.selectedKeyBindingProperty().set(viewModel);
         KeyEvent closeEditorEvent = new KeyEvent(KeyEvent.KEY_PRESSED, "", "", KeyCode.ESCAPE, false, false, false, false);
 
-        assertEquals(KeyBinding.CLOSE_ENTRY_EDITOR.getDefaultKeyBinding(), KeyCode.ESCAPE.getName());
+        assertEquals(KeyBinding.CLOSE.getDefaultKeyBinding(), KeyCode.ESCAPE.getName());
 
-        KeyCombination combi = KeyCombination.valueOf(KeyBinding.CLOSE_ENTRY_EDITOR.getDefaultKeyBinding());
+        KeyCombination combi = KeyCombination.valueOf(KeyBinding.CLOSE.getDefaultKeyBinding());
 
         assertTrue(combi.match(closeEditorEvent));
-        assertTrue(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLOSE_ENTRY_EDITOR, closeEditorEvent));
+        assertTrue(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLOSE, closeEditorEvent));
     }
 
     @Test