ESC closes the preferences dialog when editing table.

jabgui/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java

@@ -3,12 +3,14 @@
 import java.util.Locale;
 import java.util.Optional;
 
+import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.ListView;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.ToggleButton;
 import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.IconTheme;
@@ -115,6 +117,58 @@ private void initialize() {
         memoryStickMode.selectedProperty().bindBidirectional(viewModel.getMemoryStickProperty());
 
         viewModel.setValues();
+        // Delay execution until JavaFX has completed layout and the Scene object is attached to the DialogPane
+        Platform.runLater(this::installGlobalCloseBehavior);
+    }
+
+    private void installGlobalCloseBehavior() {
+        var scene = getDialogPane().getScene();
+
+        // Capture events BEFORE child nodes
+        scene.addEventFilter(KeyEvent.KEY_PRESSED, e -> {
+            if (!preferences.getKeyBindingRepository().checkKeyCombinationEquality(KeyBinding.CLOSE, e)) {
+                return;
+            }
+
+            // If any cell-based control is editing (ListView/TableView/TreeView/TreeTableView),
+            // record that the close input is for canceling edit; DO NOT consume, let the control cancel.
+            if (isAnyCellControlEditing()) {
+                return;
+            }
+
+            // No editing in progress --> close dialog
+            closeDialog();
+            e.consume();
+        });
+    }
+
+    private boolean isAnyCellControlEditing() {
+        var root = getDialogPane();
+
+        for (var n : root.lookupAll(".list-view")) {
+            if (n instanceof javafx.scene.control.ListView<?> lv && lv.getEditingIndex() != -1) {
+                return true;
+            }
+        }
+
+        for (var n : root.lookupAll(".table-view")) {
+            if (n instanceof javafx.scene.control.TableView<?> tv && tv.getEditingCell() != null) {
+                return true;
+            }
+        }
+
+        for (var n : root.lookupAll(".tree-view")) {
+            if (n instanceof javafx.scene.control.TreeView<?> trv && trv.getEditingItem() != null) {
+                return true;
+            }
+        }
+
+        for (var n : root.lookupAll(".tree-table-view")) {
+            if (n instanceof javafx.scene.control.TreeTableView<?> ttv && ttv.getEditingCell() != null) {
+                return true;
+            }
+        }
+        return false;
     }
 
     @FXML

jabgui/src/main/java/org/jabref/gui/util/BaseDialog.java

@@ -1,3 +1,5 @@
+// BaseDialog.java
+
 package org.jabref.gui.util;
 
 import java.util.Optional;