From 55362293f9bcf0a3ff37371bc3597c5f0a97467e Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Thu, 20 Aug 2026 20:52:34 +0300
Subject: [PATCH 01/32] Fix field editor focus for non-required fields and
 scroll into view

---
 .../jabref/gui/entryeditor/AllFieldsTab.java  | 16 +++++++
 .../gui/fieldeditors/FieldEditorFX.java       | 44 ++++++++++++++++---
 2 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
index bf2e20fc82dc..0ed7bf5559df 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
@@ -115,6 +115,11 @@ public class AllFieldsTab extends FieldsEditorTab {
     private final Map<FieldListSections.SectionType, Boolean> sectionExpandOverrides =
             new EnumMap<>(FieldListSections.SectionType.class);
 
+    /// Tracks the [TitledPane] created for each section type, so we can expand a collapsed
+    /// section on demand (e.g. when jump-to-field targets a field inside it).
+    private final Map<FieldListSections.SectionType, TitledPane> sectionPanes =
+            new EnumMap<>(FieldListSections.SectionType.class);
+
     /// Sticky per tab instance: whether the secondary-optional chips are expanded.
     private boolean showSecondaryOptionalChips;
 
@@ -253,6 +258,15 @@ private void refreshShownFieldsIfNeeded(FieldChangedEvent event) {
         }
     }
 
+    @Override
+    public void requestFocus(Field fieldName) {
+        TitledPane pane = sectionPanes.get(FieldListSections.sectionOf(fieldName));
+        if (pane != null && !pane.isExpanded()) {
+            pane.setExpanded(true);
+        }
+        super.requestFocus(fieldName);
+    }
+
     /// Main fields as a grid with natural row heights, then the optional-field chip bar,
     /// then the always-present collapsible sections (identifiers / files & links /
     /// bibliometrics / comments / meta, collapsed when empty) each with its own add-chips,
@@ -260,6 +274,7 @@ private void refreshShownFieldsIfNeeded(FieldChangedEvent event) {
     /// tab height.
     @Override
     protected void layoutEditors(BibDatabaseContext bibDatabaseContext, BibEntry entry, boolean compressed, List<Label> labels) {
+        sectionPanes.clear();
         // labels were created in editors-map iteration order (see FieldsEditorTab#setupPanel)
         Map<Field, Label> labelForField = new LinkedHashMap<>();
         int labelIndex = 0;
@@ -444,6 +459,7 @@ private TitledPane createSectionPane(FieldListSections.SectionType type,
         if (pane.isExpanded()) {
             populateContent.run();
         }
+        sectionPanes.put(type, pane);
         return pane;
     }
 
diff --git a/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java b/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
index 3f6ffbdebe42..a22ae6e87129 100644
--- a/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
+++ b/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
@@ -5,7 +5,9 @@
 
 import javafx.application.Platform;
 import javafx.beans.property.StringProperty;
+import javafx.scene.Node;
 import javafx.scene.Parent;
+import javafx.scene.control.ScrollPane;
 import javafx.scene.control.TextInputControl;
 import javafx.scene.input.KeyEvent;
 
@@ -137,11 +139,43 @@ private void setTextAndUpdateCaretPosition(TextInputControl textInputControl, St
     Parent getNode();
 
     default void focus() {
-        getNode().getChildrenUnmodifiable()
-                 .stream()
-                 .findFirst()
-                 .orElse(getNode())
-                 .requestFocus();
+        TextInputControl input = findTextInput(getNode());
+        Node target = (input != null) ? input : getNode();
+        target.requestFocus();
+        Platform.runLater(() -> scrollToVisible(target));
+    }
+
+    private static TextInputControl findTextInput(Node node) {
+        if (node instanceof TextInputControl textInput) {
+            return textInput;
+        }
+        if (node instanceof Parent parent) {
+            for (Node child : parent.getChildrenUnmodifiable()) {
+                TextInputControl found = findTextInput(child);
+                if (found != null) {
+                    return found;
+                }
+            }
+        }
+        return null;
+    }
+
+    private static void scrollToVisible(Node node) {
+        double offsetY = 0;
+        Node current = node;
+        while (current != null) {
+            if (current instanceof ScrollPane scrollPane) {
+                double contentHeight = scrollPane.getContent().getLayoutBounds().getHeight();
+                double viewportHeight = scrollPane.getViewportBounds().getHeight();
+                if (contentHeight > viewportHeight) {
+                    double target = (offsetY - viewportHeight / 2) / (contentHeight - viewportHeight);
+                    scrollPane.setVvalue(Math.clamp(target, 0, 1));
+                }
+                return;
+            }
+            offsetY += current.getLayoutY();
+            current = current.getParent();
+        }
     }
 
     /// Returns relative size of the field editor in terms of display space.

From d60efad8643c28f2c52f4c6dc9a97d3fb3e0bc4e Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Thu, 20 Aug 2026 22:14:42 +0300
Subject: [PATCH 02/32] Allow jump-to-field to search all fields

---
 .../jabref/gui/entryeditor/AllFieldsTab.java  | 23 ++++++++++++++-----
 .../entryeditor/EntryEditorFocusUtils.java    | 18 ++++++++++++++-
 .../gui/entryeditor/JumpToFieldViewModel.java | 14 +++++------
 3 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
index 0ed7bf5559df..5e5feec8c2fb 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
@@ -593,15 +593,26 @@ private void showFieldEditor(BibDatabaseContext bibDatabaseContext, BibEntry ent
             if (getCurrentEntry() != entry) {
                 return;
             }
-            requestFocus(field);
-            // Adding the File field via its "+" chip should immediately open the add-file dialog,
-            // since an empty File editor has no other purpose than to receive a file.
-            if ((StandardField.FILE == field) && (editors.get(field) instanceof LinkedFilesEditor linkedFilesEditor)) {
-                linkedFilesEditor.addNewFile();
-            }
+            Platform.runLater(() -> {
+                requestFocus(field);
+                // Adding the File field via its "+" chip should immediately open the add-file dialog,
+                // since an empty File editor has no other purpose than to receive a file.
+                if ((StandardField.FILE == field) && (editors.get(field) instanceof LinkedFilesEditor linkedFilesEditor)) {
+                    linkedFilesEditor.addNewFile();
+                }
+            });
         });
     }
 
+    /// Adds `field` to the entry's field list (if not already shown) and focuses it.
+    public void addFieldAndFocus(Field field) {
+        BibEntry entry = getCurrentEntry();
+        if (entry == null) {
+            return;
+        }
+        showFieldEditor(activeDatabaseContext(), entry, field);
+    }
+
     private void rebuildPanel(BibDatabaseContext bibDatabaseContext, BibEntry entry) {
         setupPanel(bibDatabaseContext, entry, false);
     }
diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
index 1d788426aaf4..6e1bfd84b752 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
@@ -72,7 +72,9 @@ void setFocusToField(Field field) {
                 tab -> selectTabAndField(tab, field),
                 () -> {
                     Field aliasField = EntryConverter.FIELD_ALIASES.get(field);
-                    getTabContainingField(aliasField).ifPresent(tab -> selectTabAndField(tab, aliasField));
+                    getTabContainingField(aliasField).ifPresentOrElse(
+                            tab -> selectTabAndField(tab, aliasField),
+                            () -> addFieldViaAllFieldsTab(field));
                 }
         ));
     }
@@ -85,6 +87,20 @@ private Optional<FieldsEditorTab> getTabContainingField(Field field) {
                       .findFirst();
     }
 
+    private void addFieldViaAllFieldsTab(Field field) {
+        if (!FieldFactory.getAllFieldsWithOutInternal().contains(field)) {
+            return;
+        }
+        tabPane.getTabs().stream()
+               .filter(AllFieldsTab.class::isInstance)
+               .map(AllFieldsTab.class::cast)
+               .findFirst()
+               .ifPresent(allFieldsTab -> {
+                   tabPane.getSelectionModel().select(allFieldsTab);
+                   allFieldsTab.addFieldAndFocus(field);
+               });
+    }
+
     private void selectTabAndField(FieldsEditorTab tab, Field field) {
         Platform.runLater(() -> {
             tabPane.getSelectionModel().select(tab);
diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldViewModel.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldViewModel.java
index ddec1a12871d..4a8c9cc01ef0 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldViewModel.java
@@ -8,6 +8,7 @@
 
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.FieldFactory;
 
 public class JumpToFieldViewModel extends AbstractViewModel {
 
@@ -27,13 +28,10 @@ public List<String> getFieldNames() {
             return List.of();
         }
 
-        return entryEditor.getAllPossibleTabs().stream()
-                          .filter(FieldsEditorTab.class::isInstance)
-                          .map(FieldsEditorTab.class::cast)
-                          .flatMap(tab -> tab.getShownFields().stream())
-                          .map(Field::getName)
-                          .distinct()
-                          .sorted()
-                          .collect(Collectors.toList());
+        return FieldFactory.getAllFieldsWithOutInternal().stream()
+                           .map(Field::getName)
+                           .distinct()
+                           .sorted()
+                           .collect(Collectors.toList());
     }
 }

From 9a3953a25ac10a2a282338931144d0510ac5f8cc Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Thu, 20 Aug 2026 22:48:42 +0300
Subject: [PATCH 03/32] Add changes to CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca5cd9a4d470..820b30ddbc5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2135,6 +2135,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We fixed an issue where opening the menu 'Library properties' marked the library as modified. [#6451](https://github.com/JabRef/jabref/issues/6451)
 - We fixed an issue when importing resulted in an exception. [#7343](https://github.com/JabRef/jabref/issues/7343)
 - We fixed an issue where the field in the Field formatter dropdown selection were sorted in random order. [#7710](https://github.com/JabRef/jabref/issues/7710)
+- We fixed an issue where the "Jump to field" dialog only searched fields already shown in the entry editor. It now searches all known fields and adds the selected field if it is not yet visible. [#16593](https://github.com/JabRef/jabref/issues/16593)
 
 ### Removed
 

From 3765a9dc943ba2042e267681401210607bca6bfd Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Thu, 20 Aug 2026 23:13:44 +0300
Subject: [PATCH 04/32] Replace null checks with Optional and instanceof
 pattern matching

---
 .../jabref/gui/entryeditor/AllFieldsTab.java  | 14 ++++------
 .../gui/fieldeditors/FieldEditorFX.java       | 28 +++++++++----------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
index 5e5feec8c2fb..75292cf8f5c0 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
@@ -260,10 +260,9 @@ private void refreshShownFieldsIfNeeded(FieldChangedEvent event) {
 
     @Override
     public void requestFocus(Field fieldName) {
-        TitledPane pane = sectionPanes.get(FieldListSections.sectionOf(fieldName));
-        if (pane != null && !pane.isExpanded()) {
-            pane.setExpanded(true);
-        }
+        Optional.ofNullable(sectionPanes.get(FieldListSections.sectionOf(fieldName)))
+                .filter(pane -> !pane.isExpanded())
+                .ifPresent(pane -> pane.setExpanded(true));
         super.requestFocus(fieldName);
     }
 
@@ -606,11 +605,8 @@ private void showFieldEditor(BibDatabaseContext bibDatabaseContext, BibEntry ent
 
     /// Adds `field` to the entry's field list (if not already shown) and focuses it.
     public void addFieldAndFocus(Field field) {
-        BibEntry entry = getCurrentEntry();
-        if (entry == null) {
-            return;
-        }
-        showFieldEditor(activeDatabaseContext(), entry, field);
+        Optional.ofNullable(getCurrentEntry())
+                .ifPresent(entry -> showFieldEditor(activeDatabaseContext(), entry, field));
     }
 
     private void rebuildPanel(BibDatabaseContext bibDatabaseContext, BibEntry entry) {
diff --git a/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java b/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
index a22ae6e87129..fb04ede34e8d 100644
--- a/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
+++ b/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
@@ -2,6 +2,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 
 import javafx.application.Platform;
 import javafx.beans.property.StringProperty;
@@ -139,32 +140,29 @@ private void setTextAndUpdateCaretPosition(TextInputControl textInputControl, St
     Parent getNode();
 
     default void focus() {
-        TextInputControl input = findTextInput(getNode());
-        Node target = (input != null) ? input : getNode();
+        Node target = findTextInput(getNode()).map(input -> (Node) input).orElseGet(this::getNode);
         target.requestFocus();
         Platform.runLater(() -> scrollToVisible(target));
     }
 
-    private static TextInputControl findTextInput(Node node) {
+    private static Optional<TextInputControl> findTextInput(Node node) {
         if (node instanceof TextInputControl textInput) {
-            return textInput;
+            return Optional.of(textInput);
         }
         if (node instanceof Parent parent) {
-            for (Node child : parent.getChildrenUnmodifiable()) {
-                TextInputControl found = findTextInput(child);
-                if (found != null) {
-                    return found;
-                }
-            }
+            return parent.getChildrenUnmodifiable().stream()
+                         .map(FieldEditorFX::findTextInput)
+                         .flatMap(Optional::stream)
+                         .findFirst();
         }
-        return null;
+        return Optional.empty();
     }
 
     private static void scrollToVisible(Node node) {
         double offsetY = 0;
         Node current = node;
-        while (current != null) {
-            if (current instanceof ScrollPane scrollPane) {
+        while (current instanceof Node currentNode) {
+            if (currentNode instanceof ScrollPane scrollPane) {
                 double contentHeight = scrollPane.getContent().getLayoutBounds().getHeight();
                 double viewportHeight = scrollPane.getViewportBounds().getHeight();
                 if (contentHeight > viewportHeight) {
@@ -173,8 +171,8 @@ private static void scrollToVisible(Node node) {
                 }
                 return;
             }
-            offsetY += current.getLayoutY();
-            current = current.getParent();
+            offsetY += currentNode.getLayoutY();
+            current = currentNode.getParent();
         }
     }
 

From 50e03b964a8dc79a54c593c31d72dd0e42b7d369 Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Thu, 20 Aug 2026 23:25:04 +0300
Subject: [PATCH 05/32] Move changes under unreleased section

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 820b30ddbc5d..79a11fa3e62a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -148,6 +148,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We fixed an issue where the button shape changed when hovering over it. [#16188](https://github.com/JabRef/jabref/issues/16188)
 - We fixed handling of `exit` in the LSP server. [#16268](https://github.com/JabRef/jabref/pull/16268)
 - We fixed an issue where `LinkedFile.isOnlineLink()` did not recognize `ftp://` links as online links. [#16400](https://github.com/JabRef/jabref/issues/16400)
+- We fixed an issue where the "Jump to field" dialog only searched fields already shown in the entry editor. It now searches all known fields and adds the selected field if it is not yet visible. [#16593](https://github.com/JabRef/jabref/issues/16593)
 
 ### Removed
 
@@ -2135,7 +2136,6 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We fixed an issue where opening the menu 'Library properties' marked the library as modified. [#6451](https://github.com/JabRef/jabref/issues/6451)
 - We fixed an issue when importing resulted in an exception. [#7343](https://github.com/JabRef/jabref/issues/7343)
 - We fixed an issue where the field in the Field formatter dropdown selection were sorted in random order. [#7710](https://github.com/JabRef/jabref/issues/7710)
-- We fixed an issue where the "Jump to field" dialog only searched fields already shown in the entry editor. It now searches all known fields and adds the selected field if it is not yet visible. [#16593](https://github.com/JabRef/jabref/issues/16593)
 
 ### Removed
 

From adecf23521faf6a14488c447a3bb279a45f21937 Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Fri, 21 Aug 2026 00:00:14 +0300
Subject: [PATCH 06/32] Fix runLater guards

---
 .../org/jabref/gui/entryeditor/AllFieldsTab.java     | 12 ++++++------
 .../org/jabref/gui/fieldeditors/FieldEditorFX.java   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
index 75292cf8f5c0..fec3877bae72 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
@@ -586,13 +586,13 @@ private void showFieldEditor(BibDatabaseContext bibDatabaseContext, BibEntry ent
         userAddedFields.add(field);
         rebuildPanel(bibDatabaseContext, entry);
         Platform.runLater(() -> {
-            // The tab may have been rebound to a different entry before this deferred block runs;
-            // the editors map would then belong to that other entry, so focusing/adding here would
-            // act on the wrong entry. Bail out unless we are still showing the entry we started with.
-            if (getCurrentEntry() != entry) {
-                return;
-            }
+            // Wait for the next pulse so the editors rebuilt by setupPanel are laid out and
+            // requestFocus/findEditor will work reliably. Re-check the staleness guard inside
+            // this inner block because the entry may have changed between the two pulses.
             Platform.runLater(() -> {
+                if (getCurrentEntry() != entry) {
+                    return;
+                }
                 requestFocus(field);
                 // Adding the File field via its "+" chip should immediately open the add-file dialog,
                 // since an empty File editor has no other purpose than to receive a file.
diff --git a/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java b/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
index fb04ede34e8d..d50bb5d817e1 100644
--- a/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
+++ b/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
@@ -142,7 +142,7 @@ private void setTextAndUpdateCaretPosition(TextInputControl textInputControl, St
     default void focus() {
         Node target = findTextInput(getNode()).map(input -> (Node) input).orElseGet(this::getNode);
         target.requestFocus();
-        Platform.runLater(() -> scrollToVisible(target));
+        Platform.runLater(() -> Optional.ofNullable(target.getScene()).ifPresent(_ -> scrollToVisible(target)));
     }
 
     private static Optional<TextInputControl> findTextInput(Node node) {

From c24e6ae94aa9f28a79573191c70c072ad5a14aee Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Fri, 21 Aug 2026 00:12:37 +0300
Subject: [PATCH 07/32] Refactor field handling and scrolling logic

---
 .../entryeditor/EntryEditorFocusUtils.java    |  2 +-
 .../gui/entryeditor/JumpToFieldViewModel.java |  3 +--
 .../gui/fieldeditors/FieldEditorFX.java       | 27 ++++++++++++-------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
index 6e1bfd84b752..543acc93e75b 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
@@ -74,7 +74,7 @@ void setFocusToField(Field field) {
                     Field aliasField = EntryConverter.FIELD_ALIASES.get(field);
                     getTabContainingField(aliasField).ifPresentOrElse(
                             tab -> selectTabAndField(tab, aliasField),
-                            () -> addFieldViaAllFieldsTab(field));
+                            () -> addFieldViaAllFieldsTab(Optional.ofNullable(aliasField).orElse(field)));
                 }
         ));
     }
diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldViewModel.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldViewModel.java
index 4a8c9cc01ef0..6df7c32dffb9 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldViewModel.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.entryeditor;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
@@ -32,6 +31,6 @@ public List<String> getFieldNames() {
                            .map(Field::getName)
                            .distinct()
                            .sorted()
-                           .collect(Collectors.toList());
+                           .toList();
     }
 }
diff --git a/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java b/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
index d50bb5d817e1..fb41062aed18 100644
--- a/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
+++ b/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
@@ -6,6 +6,7 @@
 
 import javafx.application.Platform;
 import javafx.beans.property.StringProperty;
+import javafx.geometry.Bounds;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.control.ScrollPane;
@@ -159,20 +160,26 @@ private static Optional<TextInputControl> findTextInput(Node node) {
     }
 
     private static void scrollToVisible(Node node) {
-        double offsetY = 0;
-        Node current = node;
-        while (current instanceof Node currentNode) {
-            if (currentNode instanceof ScrollPane scrollPane) {
-                double contentHeight = scrollPane.getContent().getLayoutBounds().getHeight();
+        Node current = node.getParent();
+        while (current != null) {
+            if (current instanceof ScrollPane scrollPane) {
+                Node content = scrollPane.getContent();
+                if (content == null) {
+                    return;
+                }
                 double viewportHeight = scrollPane.getViewportBounds().getHeight();
-                if (contentHeight > viewportHeight) {
-                    double target = (offsetY - viewportHeight / 2) / (contentHeight - viewportHeight);
-                    scrollPane.setVvalue(Math.clamp(target, 0, 1));
+                double contentHeight = content.getBoundsInLocal().getHeight();
+                if (contentHeight <= viewportHeight) {
+                    return;
                 }
+                Bounds targetInContent = content.sceneToLocal(node.localToScene(node.getBoundsInLocal()));
+                double targetCenterY = targetInContent.getCenterY();
+                double maxScrollY = contentHeight - viewportHeight;
+                double desiredScrollY = targetCenterY - (viewportHeight / 2);
+                scrollPane.setVvalue(Math.clamp(desiredScrollY / maxScrollY, 0, 1));
                 return;
             }
-            offsetY += currentNode.getLayoutY();
-            current = currentNode.getParent();
+            current = current.getParent();
         }
     }
 

From 9291e1a712de9bfe60c607863c7c65d130ad31c2 Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Fri, 21 Aug 2026 00:23:23 +0300
Subject: [PATCH 08/32] Simplify comments in runLater logic for clarity

---
 .../main/java/org/jabref/gui/entryeditor/AllFieldsTab.java    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
index fec3877bae72..e26b4bd348eb 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
@@ -586,9 +586,7 @@ private void showFieldEditor(BibDatabaseContext bibDatabaseContext, BibEntry ent
         userAddedFields.add(field);
         rebuildPanel(bibDatabaseContext, entry);
         Platform.runLater(() -> {
-            // Wait for the next pulse so the editors rebuilt by setupPanel are laid out and
-            // requestFocus/findEditor will work reliably. Re-check the staleness guard inside
-            // this inner block because the entry may have changed between the two pulses.
+            // Re-check the staleness guard inside this inner block because the entry may have changed between the two pulses.
             Platform.runLater(() -> {
                 if (getCurrentEntry() != entry) {
                     return;

From a178cfb529eb6f337e9c788d4dada98191f99a54 Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Sat, 22 Aug 2026 17:58:20 +0300
Subject: [PATCH 09/32] Fix dialog not opening after left-click on another
 entry in the main entry table

---
 .../main/java/org/jabref/gui/entryeditor/EntryEditor.java | 8 +++-----
 .../src/main/java/org/jabref/gui/frame/JabRefFrame.java   | 7 +++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 90330d0647c3..73058899f9ae 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -254,10 +254,6 @@ private void setupKeyBindings() {
                         tabSupplier.get().selectPreviousEntry();
                         event.consume();
                     }
-                    case JUMP_TO_FIELD -> {
-                        openJumpToFieldDialog();
-                        event.consume();
-                    }
                     case HELP -> {
                         new HelpAction(HelpFile.ENTRY_EDITOR, dialogService, preferences.getExternalApplicationsPreferences()).execute();
                         event.consume();
@@ -298,7 +294,9 @@ private void jumpToFieldButton() {
         openJumpToFieldDialog();
     }
 
-    private void openJumpToFieldDialog() {
+    /// Shows the jump-to-field dialog for the currently edited entry.
+    /// Handled globally in [org.jabref.gui.frame.JabRefFrame] so that it works regardless of where the keyboard focus lies.
+    public void openJumpToFieldDialog() {
         if (jumpToFieldDialog != null && jumpToFieldDialog.isShowing()) {
             BaseDialog.bringToFront(jumpToFieldDialog);
             return;
diff --git a/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java b/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java
index 37c5fde1c1d4..56b314af8f18 100644
--- a/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java
+++ b/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java
@@ -397,6 +397,13 @@ private void initKeyBindings() {
                             event.consume();
                         }
                         break;
+                    case JUMP_TO_FIELD:
+                        // Handled here so that it also fires when the keyboard focus is outside the entry editor
+                        if (stateManager.getEditorShowing().get()) {
+                            entryEditor.openJumpToFieldDialog();
+                            event.consume();
+                        }
+                        break;
                     case CLOSE_DATABASE:
                         new CloseDatabaseAction(this, stateManager).execute();
                         event.consume();

From 9b0b16a326b0c67949f62fdb465a788e3cfa182d Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Sun, 23 Aug 2026 18:38:46 +0300
Subject: [PATCH 10/32] Refactor scrolling logic by extracting to ScrollUtils

---
 .../gui/fieldeditors/FieldEditorFX.java       | 17 ++--------
 .../java/org/jabref/gui/util/ScrollUtils.java | 33 +++++++++++++++++++
 .../utils/WalkthroughScroller.java            | 25 ++------------
 3 files changed, 38 insertions(+), 37 deletions(-)
 create mode 100644 jabgui/src/main/java/org/jabref/gui/util/ScrollUtils.java

diff --git a/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java b/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
index fb41062aed18..7ce052f2c7d3 100644
--- a/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
+++ b/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
@@ -6,7 +6,6 @@
 
 import javafx.application.Platform;
 import javafx.beans.property.StringProperty;
-import javafx.geometry.Bounds;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.control.ScrollPane;
@@ -17,6 +16,7 @@
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
+import org.jabref.gui.util.ScrollUtils;
 import org.jabref.gui.util.UiTaskExecutor;
 import org.jabref.model.entry.BibEntry;
 
@@ -163,20 +163,7 @@ private static void scrollToVisible(Node node) {
         Node current = node.getParent();
         while (current != null) {
             if (current instanceof ScrollPane scrollPane) {
-                Node content = scrollPane.getContent();
-                if (content == null) {
-                    return;
-                }
-                double viewportHeight = scrollPane.getViewportBounds().getHeight();
-                double contentHeight = content.getBoundsInLocal().getHeight();
-                if (contentHeight <= viewportHeight) {
-                    return;
-                }
-                Bounds targetInContent = content.sceneToLocal(node.localToScene(node.getBoundsInLocal()));
-                double targetCenterY = targetInContent.getCenterY();
-                double maxScrollY = contentHeight - viewportHeight;
-                double desiredScrollY = targetCenterY - (viewportHeight / 2);
-                scrollPane.setVvalue(Math.clamp(desiredScrollY / maxScrollY, 0, 1));
+                ScrollUtils.scrollIntoScrollPane(scrollPane, node.localToScene(node.getBoundsInLocal()));
                 return;
             }
             current = current.getParent();
diff --git a/jabgui/src/main/java/org/jabref/gui/util/ScrollUtils.java b/jabgui/src/main/java/org/jabref/gui/util/ScrollUtils.java
new file mode 100644
index 000000000000..9a2cc26b37bd
--- /dev/null
+++ b/jabgui/src/main/java/org/jabref/gui/util/ScrollUtils.java
@@ -0,0 +1,33 @@
+package org.jabref.gui.util;
+
+import javafx.geometry.Bounds;
+import javafx.scene.Node;
+import javafx.scene.control.ScrollPane;
+
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
+public final class ScrollUtils {
+
+    private ScrollUtils() {
+    }
+
+    public static void scrollIntoScrollPane(ScrollPane scrollPane, Bounds targetBounds) {
+        Node content = scrollPane.getContent();
+        if (content == null) {
+            return;
+        }
+
+        Bounds contentBounds = content.getBoundsInLocal();
+        double viewportHeight = scrollPane.getViewportBounds().getHeight();
+        if (contentBounds.getHeight() <= viewportHeight) {
+            return;
+        }
+
+        Bounds targetInContent = content.sceneToLocal(targetBounds);
+        double maxScrollY = contentBounds.getHeight() - viewportHeight;
+        double desiredScrollY = targetInContent.getCenterY() - (viewportHeight / 2);
+
+        scrollPane.setVvalue(Math.clamp(desiredScrollY / maxScrollY, 0, 1));
+    }
+}
diff --git a/jabgui/src/main/java/org/jabref/gui/walkthrough/utils/WalkthroughScroller.java b/jabgui/src/main/java/org/jabref/gui/walkthrough/utils/WalkthroughScroller.java
index c7a24557d4b1..a38bf3b1bce0 100644
--- a/jabgui/src/main/java/org/jabref/gui/walkthrough/utils/WalkthroughScroller.java
+++ b/jabgui/src/main/java/org/jabref/gui/walkthrough/utils/WalkthroughScroller.java
@@ -11,6 +11,8 @@
 import javafx.scene.control.TableView;
 import javafx.scene.control.TreeView;
 
+import org.jabref.gui.util.ScrollUtils;
+
 import com.tobiasdiez.easybind.EasyBind;
 import com.tobiasdiez.easybind.Subscription;
 import org.jspecify.annotations.NonNull;
@@ -74,7 +76,7 @@ private void scrollNodeIntoViewForParent(@NonNull Node targetNode, @NonNull Node
             switch (scrollableParent) {
                 case ScrollPane scrollPane -> {
                     Bounds targetBounds = targetNode.localToScene(targetNode.getBoundsInLocal());
-                    scrollIntoScrollPane(scrollPane, targetBounds);
+                    ScrollUtils.scrollIntoScrollPane(scrollPane, targetBounds);
                 }
                 case ListView<?> listView ->
                         scrollIntoListView(targetNode, listView);
@@ -90,27 +92,6 @@ private void scrollNodeIntoViewForParent(@NonNull Node targetNode, @NonNull Node
         }
     }
 
-    private void scrollIntoScrollPane(@NonNull ScrollPane scrollPane, @NonNull Bounds targetBounds) {
-        Node content = scrollPane.getContent();
-        if (content == null) {
-            return;
-        }
-
-        Bounds contentBounds = content.getBoundsInLocal();
-        double viewportHeight = scrollPane.getViewportBounds().getHeight();
-        if (contentBounds.getHeight() <= viewportHeight) {
-            return;
-        }
-
-        Bounds targetInContent = content.sceneToLocal(targetBounds);
-        double targetCenterY = targetInContent.getCenterY();
-        double maxScrollY = contentBounds.getHeight() - viewportHeight;
-        double desiredScrollY = targetCenterY - (viewportHeight / 2);
-
-        double vValue = Math.max(0, Math.min(1, desiredScrollY / maxScrollY));
-        scrollPane.setVvalue(vValue);
-    }
-
     private void scrollIntoListView(@NonNull Node targetNode, @NonNull ListView<?> listView) {
         int index = findItemIndex(targetNode, listView, listView.getItems().size(), listView.getFixedCellSize());
         if (index != -1) {

From b4b9d9889fbcc1381788ec874f41fcb68037e419 Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Sun, 23 Aug 2026 19:34:21 +0300
Subject: [PATCH 11/32] Introduce NodeTraversalUtils for improved text input
 node traversal

---
 .../jabref/gui/entryeditor/AllFieldsTab.java  | 21 ++----------
 .../gui/fieldeditors/FieldEditorFX.java       | 16 ++--------
 .../jabref/gui/util/NodeTraversalUtils.java   | 32 +++++++++++++++++++
 3 files changed, 36 insertions(+), 33 deletions(-)
 create mode 100644 jabgui/src/main/java/org/jabref/gui/util/NodeTraversalUtils.java

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
index e26b4bd348eb..915392212eab 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
@@ -29,7 +29,6 @@
 import javafx.scene.control.Label;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
-import javafx.scene.control.TextInputControl;
 import javafx.scene.control.TitledPane;
 import javafx.scene.control.Tooltip;
 import javafx.scene.layout.ColumnConstraints;
@@ -52,6 +51,7 @@
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
 import org.jabref.gui.util.FieldsUtil;
+import org.jabref.gui.util.NodeTraversalUtils;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.strings.StringUtil;
@@ -375,7 +375,7 @@ private Node wrapWithRemoveButton(BibDatabaseContext bibDatabaseContext, BibEntr
     /// preserving its HBox grow priority) and overlays `button` on it. Returns the new overlay
     /// pane, or empty if the editor exposes no plain text input to overlay onto.
     private static Optional<StackPane> overlayInsideTextInput(Node editorNode, Button button) {
-        return findPrimaryTextInput(editorNode).flatMap(input -> {
+        return NodeTraversalUtils.findFirstTextInput(editorNode).flatMap(input -> {
             if (!(input.getParent() instanceof Pane parent)) {
                 return Optional.empty();
             }
@@ -395,23 +395,6 @@ private static Optional<StackPane> overlayInsideTextInput(Node editorNode, Butto
         });
     }
 
-    /// First [TextInputControl] in the editor node's subtree (the row-filling text field/area),
-    /// or empty for composite editors that have none.
-    private static Optional<TextInputControl> findPrimaryTextInput(Node node) {
-        if (node instanceof TextInputControl textInput) {
-            return Optional.of(textInput);
-        }
-        if (node instanceof Parent parent) {
-            for (Node child : parent.getChildrenUnmodifiable()) {
-                Optional<TextInputControl> found = findPrimaryTextInput(child);
-                if (found.isPresent()) {
-                    return found;
-                }
-            }
-        }
-        return Optional.empty();
-    }
-
     /// Hides a still-empty, user-added field row again (reachable only for non-required,
     /// currently blank fields; see [#wrapWithRemoveButton]).
     private void removeFieldRow(BibDatabaseContext bibDatabaseContext, BibEntry entry, Field field) {
diff --git a/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java b/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
index 7ce052f2c7d3..0fc86c42afdc 100644
--- a/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
+++ b/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
@@ -16,6 +16,7 @@
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
+import org.jabref.gui.util.NodeTraversalUtils;
 import org.jabref.gui.util.ScrollUtils;
 import org.jabref.gui.util.UiTaskExecutor;
 import org.jabref.model.entry.BibEntry;
@@ -141,24 +142,11 @@ private void setTextAndUpdateCaretPosition(TextInputControl textInputControl, St
     Parent getNode();
 
     default void focus() {
-        Node target = findTextInput(getNode()).map(input -> (Node) input).orElseGet(this::getNode);
+        Node target = NodeTraversalUtils.findFirstTextInput(getNode()).map(input -> (Node) input).orElseGet(this::getNode);
         target.requestFocus();
         Platform.runLater(() -> Optional.ofNullable(target.getScene()).ifPresent(_ -> scrollToVisible(target)));
     }
 
-    private static Optional<TextInputControl> findTextInput(Node node) {
-        if (node instanceof TextInputControl textInput) {
-            return Optional.of(textInput);
-        }
-        if (node instanceof Parent parent) {
-            return parent.getChildrenUnmodifiable().stream()
-                         .map(FieldEditorFX::findTextInput)
-                         .flatMap(Optional::stream)
-                         .findFirst();
-        }
-        return Optional.empty();
-    }
-
     private static void scrollToVisible(Node node) {
         Node current = node.getParent();
         while (current != null) {
diff --git a/jabgui/src/main/java/org/jabref/gui/util/NodeTraversalUtils.java b/jabgui/src/main/java/org/jabref/gui/util/NodeTraversalUtils.java
new file mode 100644
index 000000000000..2efa983486e1
--- /dev/null
+++ b/jabgui/src/main/java/org/jabref/gui/util/NodeTraversalUtils.java
@@ -0,0 +1,32 @@
+package org.jabref.gui.util;
+
+import java.util.Optional;
+
+import javafx.scene.Node;
+import javafx.scene.Parent;
+import javafx.scene.control.TextInputControl;
+
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
+public final class NodeTraversalUtils {
+    private NodeTraversalUtils() {
+    }
+
+    /// First [TextInputControl] in the editor node's subtree (the row-filling text field/area),
+    /// or empty for composite editors that have none.
+    public static Optional<TextInputControl> findFirstTextInput(Node node) {
+        if (node instanceof TextInputControl textInput) {
+            return Optional.of(textInput);
+        }
+        if (node instanceof Parent parent) {
+            for (Node child : parent.getChildrenUnmodifiable()) {
+                Optional<TextInputControl> found = findFirstTextInput(child);
+                if (found.isPresent()) {
+                    return found;
+                }
+            }
+        }
+        return Optional.empty();
+    }
+}

From ec4f3cf6a3a4f7245e15ff021a5ab11777f00a54 Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Sun, 23 Aug 2026 19:35:09 +0300
Subject: [PATCH 12/32] Fix focus fallback for composite field editors

---
 .../java/org/jabref/gui/fieldeditors/FieldEditorFX.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java b/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
index 0fc86c42afdc..85676582f321 100644
--- a/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
+++ b/jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
@@ -142,7 +142,12 @@ private void setTextAndUpdateCaretPosition(TextInputControl textInputControl, St
     Parent getNode();
 
     default void focus() {
-        Node target = NodeTraversalUtils.findFirstTextInput(getNode()).map(input -> (Node) input).orElseGet(this::getNode);
+        Node target = NodeTraversalUtils.findFirstTextInput(getNode())
+                                        .map(input -> (Node) input)
+                                        .orElseGet(() -> getNode().getChildrenUnmodifiable()
+                                                                  .stream()
+                                                                  .findFirst()
+                                                                  .orElse(getNode()));
         target.requestFocus();
         Platform.runLater(() -> Optional.ofNullable(target.getScene()).ifPresent(_ -> scrollToVisible(target)));
     }

From d8f42aefb22d1c477c43e4f62d023e9cf707314b Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Sun, 23 Aug 2026 20:21:28 +0300
Subject: [PATCH 13/32] Include citation key and entry fields in jump
 suggestions

---
 .../jabref/gui/entryeditor/EntryEditor.java   |  4 ----
 .../gui/entryeditor/EntryEditorViewModel.java |  5 ----
 .../gui/entryeditor/JumpToFieldViewModel.java | 24 ++++++++++++++-----
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 73058899f9ae..272849c38821 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -329,10 +329,6 @@ private void navigateToNextEntry() {
         return viewModel.getCurrentlyEditedEntry();
     }
 
-    public List<EntryEditorTab> getAllPossibleTabs() {
-        return viewModel.getAllPossibleTabs();
-    }
-
     private void onEntryChanged(@NonNull BibEntry entry) {
         // Tabs observe viewModel.currentlyEditedEntryProperty() directly (bound in rebuildTabs), so no fan-out here.
         // Type changes are handled by onEntryTypeChanged via the view model's single type subscription.
diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorViewModel.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorViewModel.java
index f8844c3bea00..9315f837300a 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorViewModel.java
@@ -167,11 +167,6 @@ public ObservableList<Tab> visibleTabs() {
         return unmodifiableVisibleTabs;
     }
 
-    /// All tabs that can possibly be shown for the current entry (regardless of visibility), in display order.
-    public List<EntryEditorTab> getAllPossibleTabs() {
-        return List.copyOf(allPossibleTabs);
-    }
-
     /// The tab the editor should select when it (re)binds to an entry: the Source tab when the user opted
     /// into "show source by default", otherwise empty (the editor keeps the current selection). The policy
     /// lives here, not in the view.
diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldViewModel.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldViewModel.java
index 6df7c32dffb9..98d1c57a6070 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldViewModel.java
@@ -1,13 +1,16 @@
 package org.jabref.gui.entryeditor;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
 import org.jabref.gui.AbstractViewModel;
+import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
+import org.jabref.model.entry.field.InternalField;
 
 public class JumpToFieldViewModel extends AbstractViewModel {
 
@@ -23,14 +26,23 @@ public StringProperty searchTextProperty() {
     }
 
     public List<String> getFieldNames() {
-        if (entryEditor.getCurrentlyEditedEntry() == null) {
+        BibEntry entry = entryEditor.getCurrentlyEditedEntry();
+        if (entry == null) {
             return List.of();
         }
 
-        return FieldFactory.getAllFieldsWithOutInternal().stream()
-                           .map(Field::getName)
-                           .distinct()
-                           .sorted()
-                           .toList();
+        return suggestedFields(entry).stream()
+                                     .map(Field::getName)
+                                     .distinct()
+                                     .sorted()
+                                     .toList();
+    }
+
+    private List<Field> suggestedFields(BibEntry entry) {
+        List<Field> suggestedFields = new ArrayList<>();
+        suggestedFields.add(InternalField.KEY_FIELD);
+        suggestedFields.addAll(entry.getFields());
+        suggestedFields.addAll(FieldFactory.getAllFieldsWithOutInternal());
+        return suggestedFields;
     }
 }

From e9f1b8311831843ee0401b7cad870084692700df Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Sun, 23 Aug 2026 20:56:11 +0300
Subject: [PATCH 14/32] keep setFocusToField read-only and add focusOrAddField
 for jump path

---
 .../jabref/gui/entryeditor/EntryEditor.java   |  2 +-
 .../entryeditor/EntryEditorFocusUtils.java    | 22 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 272849c38821..373db985357f 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -393,7 +393,7 @@ private void setupToolBar() {
     }
 
     public void selectField(String fieldName) {
-        focusUtils.setFocusToField(FieldFactory.parseField(fieldName));
+        focusUtils.focusOrAddField(FieldFactory.parseField(fieldName));
     }
 
     public void setFocusToField(Field field) {
diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
index 543acc93e75b..06f829af22ea 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
@@ -68,17 +68,37 @@ void restoreLastFocusedField() {
     // region — jump to field
 
     void setFocusToField(Field field) {
+        UiTaskExecutor.runInJavaFXThread(() -> getTabContainingField(field).ifPresentOrElse(
+                tab -> selectTabAndField(tab, field),
+                () -> {
+                    Field aliasField = EntryConverter.FIELD_ALIASES.get(field);
+                    getTabContainingField(aliasField).ifPresent(tab -> selectTabAndField(tab, aliasField));
+                }
+        ));
+    }
+
+    void focusOrAddField(Field field) {
         UiTaskExecutor.runInJavaFXThread(() -> getTabContainingField(field).ifPresentOrElse(
                 tab -> selectTabAndField(tab, field),
                 () -> {
                     Field aliasField = EntryConverter.FIELD_ALIASES.get(field);
                     getTabContainingField(aliasField).ifPresentOrElse(
                             tab -> selectTabAndField(tab, aliasField),
-                            () -> addFieldViaAllFieldsTab(Optional.ofNullable(aliasField).orElse(field)));
+                            () -> addFieldViaAllFieldsTab(aliasField)
+                    );
                 }
         ));
     }
 
+    private boolean focusTabShowing(Field field) {
+        return getTabContainingField(field)
+                .map(tab -> {
+                    selectTabAndField(tab, field);
+                    return true;
+                })
+                .orElse(false);
+    }
+
     private Optional<FieldsEditorTab> getTabContainingField(Field field) {
         return tabPane.getTabs().stream()
                       .filter(FieldsEditorTab.class::isInstance)

From e59687379b6847a8486b1e131ddca1f5207dcd41 Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Sun, 23 Aug 2026 21:15:21 +0300
Subject: [PATCH 15/32] Add jump-to-field targets under their database-mode
 canonical name

---
 .../jabref/gui/entryeditor/EntryEditor.java   |  2 +-
 .../entryeditor/EntryEditorFocusUtils.java    | 28 +++++++++++--------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 373db985357f..2b6c128c22c9 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -151,7 +151,7 @@ public EntryEditor(Supplier<LibraryTab> tabSupplier, UndoAction undoAction, Redo
         typeLabel.textProperty().bind(viewModel.typeLabelTextProperty());
         Bindings.bindContent(tabbed.getTabs(), viewModel.visibleTabs());
 
-        this.focusUtils = new EntryEditorFocusUtils(tabbed, this);
+        this.focusUtils = new EntryEditorFocusUtils(tabbed, this, () -> tabSupplier.get().getBibDatabaseContext().getMode());
 
         setupKeyBindings();
         setupDragAndDrop();
diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
index 06f829af22ea..fd673a917bbf 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
@@ -1,7 +1,9 @@
 package org.jabref.gui.entryeditor;
 
 import java.util.Collection;
+import java.util.Map;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 import javafx.application.Platform;
 import javafx.scene.Node;
@@ -13,6 +15,7 @@
 import javafx.scene.input.KeyEvent;
 
 import org.jabref.gui.util.UiTaskExecutor;
+import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.EntryConverter;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
@@ -27,12 +30,14 @@ class EntryEditorFocusUtils {
 
     private final TabPane tabPane;
     private final Node sceneSource;
+    private final Supplier<BibDatabaseMode> databaseModeSupplier;
 
     private @Nullable Field lastFocusedField;
 
-    EntryEditorFocusUtils(TabPane tabPane, Node sceneSource) {
+    EntryEditorFocusUtils(TabPane tabPane, Node sceneSource, Supplier<BibDatabaseMode> databaseModeSupplier) {
         this.tabPane = tabPane;
         this.sceneSource = sceneSource;
+        this.databaseModeSupplier = databaseModeSupplier;
     }
 
     // region — field focus capture / restore
@@ -81,22 +86,21 @@ void focusOrAddField(Field field) {
         UiTaskExecutor.runInJavaFXThread(() -> getTabContainingField(field).ifPresentOrElse(
                 tab -> selectTabAndField(tab, field),
                 () -> {
-                    Field aliasField = EntryConverter.FIELD_ALIASES.get(field);
-                    getTabContainingField(aliasField).ifPresentOrElse(
-                            tab -> selectTabAndField(tab, aliasField),
-                            () -> addFieldViaAllFieldsTab(aliasField)
+                    Field requestedField = Optional.ofNullable(EntryConverter.FIELD_ALIASES.get(field))
+                                                   .orElse(field);
+                    getTabContainingField(requestedField).ifPresentOrElse(
+                            tab -> selectTabAndField(tab, requestedField),
+                            () -> addFieldViaAllFieldsTab(canonicalFieldForActiveMode(requestedField))
                     );
                 }
         ));
     }
 
-    private boolean focusTabShowing(Field field) {
-        return getTabContainingField(field)
-                .map(tab -> {
-                    selectTabAndField(tab, field);
-                    return true;
-                })
-                .orElse(false);
+    private Field canonicalFieldForActiveMode(Field field) {
+        Map<Field, Field> aliasesToCanonical = databaseModeSupplier.get() == BibDatabaseMode.BIBTEX
+                                               ? EntryConverter.FIELD_ALIASES_BIBLATEX_TO_BIBTEX
+                                               : EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX;
+        return aliasesToCanonical.getOrDefault(field, field);
     }
 
     private Optional<FieldsEditorTab> getTabContainingField(Field field) {

From 52033528627ef3b7abfdbee2ca6f17e2aca01380 Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Sun, 23 Aug 2026 21:36:26 +0300
Subject: [PATCH 16/32] Parse jump-to-field input with the entry's type

---
 .../main/java/org/jabref/gui/entryeditor/EntryEditor.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 2b6c128c22c9..8947be30fd50 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -393,7 +393,10 @@ private void setupToolBar() {
     }
 
     public void selectField(String fieldName) {
-        focusUtils.focusOrAddField(FieldFactory.parseField(fieldName));
+        Optional.ofNullable(viewModel.getCurrentlyEditedEntry())
+                .ifPresent(entry -> {
+                    focusUtils.focusOrAddField(FieldFactory.parseField(entry.getType(), fieldName));
+                });
     }
 
     public void setFocusToField(Field field) {

From 917ac3843259fd7367822c322730ef2180c7e0c0 Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Mon, 24 Aug 2026 04:42:19 +0300
Subject: [PATCH 17/32] Open add-file dialog only when adding File via its
 chip.

---
 .../java/org/jabref/gui/entryeditor/AllFieldsTab.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
index 915392212eab..13a797186c44 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
@@ -566,10 +566,13 @@ private void addFreeFormField(BibDatabaseContext bibDatabaseContext, BibEntry en
     /// field if necessary) and focuses it.
     // [impl->req~entry-editor.main-tab.add-chips~1]
     private void showFieldEditor(BibDatabaseContext bibDatabaseContext, BibEntry entry, Field field) {
+        showFieldEditor(bibDatabaseContext, entry, field, true);
+    }
+
+    private void showFieldEditor(BibDatabaseContext bibDatabaseContext, BibEntry entry, Field field, boolean openAddFileDialogForFile) {
         userAddedFields.add(field);
         rebuildPanel(bibDatabaseContext, entry);
         Platform.runLater(() -> {
-            // Re-check the staleness guard inside this inner block because the entry may have changed between the two pulses.
             Platform.runLater(() -> {
                 if (getCurrentEntry() != entry) {
                     return;
@@ -577,17 +580,17 @@ private void showFieldEditor(BibDatabaseContext bibDatabaseContext, BibEntry ent
                 requestFocus(field);
                 // Adding the File field via its "+" chip should immediately open the add-file dialog,
                 // since an empty File editor has no other purpose than to receive a file.
-                if ((StandardField.FILE == field) && (editors.get(field) instanceof LinkedFilesEditor linkedFilesEditor)) {
+                // navigation must not pop up a modal dialog as a side effect.
+                if (openAddFileDialogForFile && (StandardField.FILE == field) && (editors.get(field) instanceof LinkedFilesEditor linkedFilesEditor)) {
                     linkedFilesEditor.addNewFile();
                 }
             });
         });
     }
 
-    /// Adds `field` to the entry's field list (if not already shown) and focuses it.
     public void addFieldAndFocus(Field field) {
         Optional.ofNullable(getCurrentEntry())
-                .ifPresent(entry -> showFieldEditor(activeDatabaseContext(), entry, field));
+                .ifPresent(entry -> showFieldEditor(activeDatabaseContext(), entry, field, false));
     }
 
     private void rebuildPanel(BibDatabaseContext bibDatabaseContext, BibEntry entry) {

From f60d6c04872e4a160a996101298dd76480d3b90d Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Mon, 24 Aug 2026 18:46:14 +0300
Subject: [PATCH 18/32] Return getAllPossibleTabs to model

---
 .../org/jabref/gui/entryeditor/EntryEditorViewModel.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorViewModel.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorViewModel.java
index 9315f837300a..f8844c3bea00 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorViewModel.java
@@ -167,6 +167,11 @@ public ObservableList<Tab> visibleTabs() {
         return unmodifiableVisibleTabs;
     }
 
+    /// All tabs that can possibly be shown for the current entry (regardless of visibility), in display order.
+    public List<EntryEditorTab> getAllPossibleTabs() {
+        return List.copyOf(allPossibleTabs);
+    }
+
     /// The tab the editor should select when it (re)binds to an entry: the Source tab when the user opted
     /// into "show source by default", otherwise empty (the editor keeps the current selection). The policy
     /// lives here, not in the view.

From f89b3b3e5c7e3d43c083aa2e8ca1cf730fe88240 Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Tue, 25 Aug 2026 11:52:08 +0300
Subject: [PATCH 19/32] Use AllFieldsTab.getDatabaseMode()

---
 .../jabref/gui/entryeditor/AllFieldsTab.java  |  2 +-
 .../jabref/gui/entryeditor/EntryEditor.java   |  2 +-
 .../entryeditor/EntryEditorFocusUtils.java    | 28 +++++++------------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
index 13a797186c44..25af29f44d67 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
@@ -599,7 +599,7 @@ private void rebuildPanel(BibDatabaseContext bibDatabaseContext, BibEntry entry)
 
     // endregion
 
-    private BibDatabaseMode getDatabaseMode() {
+    BibDatabaseMode getDatabaseMode() {
         return stateManager.getActiveDatabase()
                            .map(BibDatabaseContext::getMode)
                            .orElse(BibDatabaseMode.BIBLATEX);
diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 8947be30fd50..c037e5474644 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -151,7 +151,7 @@ public EntryEditor(Supplier<LibraryTab> tabSupplier, UndoAction undoAction, Redo
         typeLabel.textProperty().bind(viewModel.typeLabelTextProperty());
         Bindings.bindContent(tabbed.getTabs(), viewModel.visibleTabs());
 
-        this.focusUtils = new EntryEditorFocusUtils(tabbed, this, () -> tabSupplier.get().getBibDatabaseContext().getMode());
+        this.focusUtils = new EntryEditorFocusUtils(tabbed, this);
 
         setupKeyBindings();
         setupDragAndDrop();
diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
index fd673a917bbf..c10dc4309a35 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
@@ -3,7 +3,6 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
-import java.util.function.Supplier;
 
 import javafx.application.Platform;
 import javafx.scene.Node;
@@ -30,14 +29,12 @@ class EntryEditorFocusUtils {
 
     private final TabPane tabPane;
     private final Node sceneSource;
-    private final Supplier<BibDatabaseMode> databaseModeSupplier;
 
     private @Nullable Field lastFocusedField;
 
-    EntryEditorFocusUtils(TabPane tabPane, Node sceneSource, Supplier<BibDatabaseMode> databaseModeSupplier) {
+    EntryEditorFocusUtils(TabPane tabPane, Node sceneSource) {
         this.tabPane = tabPane;
         this.sceneSource = sceneSource;
-        this.databaseModeSupplier = databaseModeSupplier;
     }
 
     // region — field focus capture / restore
@@ -85,19 +82,12 @@ void setFocusToField(Field field) {
     void focusOrAddField(Field field) {
         UiTaskExecutor.runInJavaFXThread(() -> getTabContainingField(field).ifPresentOrElse(
                 tab -> selectTabAndField(tab, field),
-                () -> {
-                    Field requestedField = Optional.ofNullable(EntryConverter.FIELD_ALIASES.get(field))
-                                                   .orElse(field);
-                    getTabContainingField(requestedField).ifPresentOrElse(
-                            tab -> selectTabAndField(tab, requestedField),
-                            () -> addFieldViaAllFieldsTab(canonicalFieldForActiveMode(requestedField))
-                    );
-                }
+                () -> addFieldViaAllFieldsTab(field)
         ));
     }
 
-    private Field canonicalFieldForActiveMode(Field field) {
-        Map<Field, Field> aliasesToCanonical = databaseModeSupplier.get() == BibDatabaseMode.BIBTEX
+    private Field canonicalFieldForActiveMode(Field field, BibDatabaseMode mode) {
+        Map<Field, Field> aliasesToCanonical = mode == BibDatabaseMode.BIBTEX
                                                ? EntryConverter.FIELD_ALIASES_BIBLATEX_TO_BIBTEX
                                                : EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX;
         return aliasesToCanonical.getOrDefault(field, field);
@@ -112,16 +102,18 @@ private Optional<FieldsEditorTab> getTabContainingField(Field field) {
     }
 
     private void addFieldViaAllFieldsTab(Field field) {
-        if (!FieldFactory.getAllFieldsWithOutInternal().contains(field)) {
-            return;
-        }
         tabPane.getTabs().stream()
                .filter(AllFieldsTab.class::isInstance)
                .map(AllFieldsTab.class::cast)
                .findFirst()
                .ifPresent(allFieldsTab -> {
+                   BibDatabaseMode mode = allFieldsTab.getDatabaseMode();
+                   Field canonicalField = canonicalFieldForActiveMode(field, mode);
+                   if (!FieldFactory.getAllFieldsWithOutInternal().contains(canonicalField)) {
+                       return;
+                   }
                    tabPane.getSelectionModel().select(allFieldsTab);
-                   allFieldsTab.addFieldAndFocus(field);
+                   allFieldsTab.addFieldAndFocus(canonicalField);
                });
     }
 

From f7274653a91fb1bf23fe7d2244037145cb469411 Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Tue, 25 Aug 2026 13:37:30 +0300
Subject: [PATCH 20/32] Guard jump-to-field dialog against hidden All Fields
 tab

---
 .../jabref/gui/entryeditor/EntryEditor.java   |  5 +++
 .../entryeditor/EntryEditorFocusUtils.java    | 34 ++++++++++++-------
 .../main/resources/l10n/JabRef_en.properties  |  1 +
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index c037e5474644..251f27a728a8 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -44,6 +44,7 @@
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.BuildInfo;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.BibEntry;
@@ -301,6 +302,10 @@ public void openJumpToFieldDialog() {
             BaseDialog.bringToFront(jumpToFieldDialog);
             return;
         }
+        if (!focusUtils.isAllFieldsTabEnabled()) {
+            dialogService.notify(Localization.lang("Enable the Main tab in Preferences -> Entry Editor to use jump-to-field"));
+            return;
+        }
 
         Optional.ofNullable(getCurrentlyEditedEntry()).ifPresent(_ -> {
             jumpToFieldDialog = new JumpToFieldDialog(this);
diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
index c10dc4309a35..af8bf31e02dc 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
@@ -102,19 +102,27 @@ private Optional<FieldsEditorTab> getTabContainingField(Field field) {
     }
 
     private void addFieldViaAllFieldsTab(Field field) {
-        tabPane.getTabs().stream()
-               .filter(AllFieldsTab.class::isInstance)
-               .map(AllFieldsTab.class::cast)
-               .findFirst()
-               .ifPresent(allFieldsTab -> {
-                   BibDatabaseMode mode = allFieldsTab.getDatabaseMode();
-                   Field canonicalField = canonicalFieldForActiveMode(field, mode);
-                   if (!FieldFactory.getAllFieldsWithOutInternal().contains(canonicalField)) {
-                       return;
-                   }
-                   tabPane.getSelectionModel().select(allFieldsTab);
-                   allFieldsTab.addFieldAndFocus(canonicalField);
-               });
+        getAllFieldsTab()
+                .ifPresent(allFieldsTab -> {
+                    BibDatabaseMode mode = allFieldsTab.getDatabaseMode();
+                    Field canonicalField = canonicalFieldForActiveMode(field, mode);
+                    if (!FieldFactory.getAllFieldsWithOutInternal().contains(canonicalField)) {
+                        return;
+                    }
+                    tabPane.getSelectionModel().select(allFieldsTab);
+                    allFieldsTab.addFieldAndFocus(canonicalField);
+                });
+    }
+
+    private Optional<AllFieldsTab> getAllFieldsTab() {
+        return tabPane.getTabs().stream()
+                      .filter(AllFieldsTab.class::isInstance)
+                      .map(AllFieldsTab.class::cast)
+                      .findFirst();
+    }
+
+    boolean isAllFieldsTabEnabled() {
+        return getAllFieldsTab().isPresent();
     }
 
     private void selectTabAndField(FieldsEditorTab tab, Field field) {
diff --git a/jablib/src/main/resources/l10n/JabRef_en.properties b/jablib/src/main/resources/l10n/JabRef_en.properties
index a9bf2aedd98d..2ddf1fa51d44 100644
--- a/jablib/src/main/resources/l10n/JabRef_en.properties
+++ b/jablib/src/main/resources/l10n/JabRef_en.properties
@@ -928,6 +928,7 @@ Credential\ store\ not\ available.=Credential store not available.
 Show\ last\ names\ only=Show last names only
 
 Show\ all\ fields=Show all fields
+Enable\ the\ Main\ tab\ in\ Preferences\ ->\ Entry\ Editor\ to\ use\ jump-to-field=Enable the Main tab in Preferences → Entry Editor to use jump-to-field
 
 Show\ less=Show less
 

From a1d730696e712f4ce243fe3b980974ad7936b56e Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Tue, 25 Aug 2026 13:50:27 +0300
Subject: [PATCH 21/32] Add comment explaining the double Platform.runLater
 pulse pattern

---
 .../src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
index 25af29f44d67..4ea90ba319f6 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
@@ -572,6 +572,8 @@ private void showFieldEditor(BibDatabaseContext bibDatabaseContext, BibEntry ent
     private void showFieldEditor(BibDatabaseContext bibDatabaseContext, BibEntry entry, Field field, boolean openAddFileDialogForFile) {
         userAddedFields.add(field);
         rebuildPanel(bibDatabaseContext, entry);
+        // The outer runLater lets one pulse pass so the editors rebuilt become focusable
+        // before the inner runLater requests focus on them.
         Platform.runLater(() -> {
             Platform.runLater(() -> {
                 if (getCurrentEntry() != entry) {

From 9661493498b2298d59f18f196aa03daf4ce50b81 Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Tue, 25 Aug 2026 15:06:19 +0300
Subject: [PATCH 22/32] Fix keyValueShouldBeEqualForEnglishPropertiesMessages

---
 .../src/main/java/org/jabref/gui/entryeditor/EntryEditor.java   | 2 +-
 jablib/src/main/resources/l10n/JabRef_en.properties             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 8e74328edfa1..848f60064ca4 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -303,7 +303,7 @@ public void openJumpToFieldDialog() {
             return;
         }
         if (!focusUtils.isAllFieldsTabEnabled()) {
-            dialogService.notify(Localization.lang("Enable the Main tab in Preferences -> Entry Editor to use jump-to-field"));
+            dialogService.notify(Localization.lang("Enable the Main tab in Preferences > Entry editor to use jump-to-field"));
             return;
         }
 
diff --git a/jablib/src/main/resources/l10n/JabRef_en.properties b/jablib/src/main/resources/l10n/JabRef_en.properties
index 9dec20b5b76a..70125e536a76 100644
--- a/jablib/src/main/resources/l10n/JabRef_en.properties
+++ b/jablib/src/main/resources/l10n/JabRef_en.properties
@@ -916,7 +916,7 @@ Credential\ store\ not\ available.=Credential store not available.
 Show\ last\ names\ only=Show last names only
 
 Show\ all\ fields=Show all fields
-Enable\ the\ Main\ tab\ in\ Preferences\ ->\ Entry\ Editor\ to\ use\ jump-to-field=Enable the Main tab in Preferences → Entry Editor to use jump-to-field
+Enable\ the\ Main\ tab\ in\ Preferences\ >\ Entry\ editor\ to\ use\ jump-to-field=Enable the Main tab in Preferences > Entry editor to use jump-to-field
 
 Show\ less=Show less
 

From 45ef1bc14548d86c7fc9bb2a0bdf1bf3c6f2a5c8 Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Fri, 28 Aug 2026 11:13:47 +0300
Subject: [PATCH 23/32] Remove check guard for jump-to-field dialog

---
 .../jabref/gui/entryeditor/EntryEditor.java   |  5 ---
 .../entryeditor/EntryEditorFocusUtils.java    | 34 +++++++------------
 .../main/resources/l10n/JabRef_en.properties  |  1 -
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 848f60064ca4..ca0c3580d0c4 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -43,7 +43,6 @@
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
-import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.undo.UndoManager;
 import org.jabref.logic.util.BuildInfo;
 import org.jabref.logic.util.TaskExecutor;
@@ -302,10 +301,6 @@ public void openJumpToFieldDialog() {
             BaseDialog.bringToFront(jumpToFieldDialog);
             return;
         }
-        if (!focusUtils.isAllFieldsTabEnabled()) {
-            dialogService.notify(Localization.lang("Enable the Main tab in Preferences > Entry editor to use jump-to-field"));
-            return;
-        }
 
         Optional.ofNullable(getCurrentlyEditedEntry()).ifPresent(_ -> {
             jumpToFieldDialog = new JumpToFieldDialog(this);
diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
index af8bf31e02dc..c10dc4309a35 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
@@ -102,27 +102,19 @@ private Optional<FieldsEditorTab> getTabContainingField(Field field) {
     }
 
     private void addFieldViaAllFieldsTab(Field field) {
-        getAllFieldsTab()
-                .ifPresent(allFieldsTab -> {
-                    BibDatabaseMode mode = allFieldsTab.getDatabaseMode();
-                    Field canonicalField = canonicalFieldForActiveMode(field, mode);
-                    if (!FieldFactory.getAllFieldsWithOutInternal().contains(canonicalField)) {
-                        return;
-                    }
-                    tabPane.getSelectionModel().select(allFieldsTab);
-                    allFieldsTab.addFieldAndFocus(canonicalField);
-                });
-    }
-
-    private Optional<AllFieldsTab> getAllFieldsTab() {
-        return tabPane.getTabs().stream()
-                      .filter(AllFieldsTab.class::isInstance)
-                      .map(AllFieldsTab.class::cast)
-                      .findFirst();
-    }
-
-    boolean isAllFieldsTabEnabled() {
-        return getAllFieldsTab().isPresent();
+        tabPane.getTabs().stream()
+               .filter(AllFieldsTab.class::isInstance)
+               .map(AllFieldsTab.class::cast)
+               .findFirst()
+               .ifPresent(allFieldsTab -> {
+                   BibDatabaseMode mode = allFieldsTab.getDatabaseMode();
+                   Field canonicalField = canonicalFieldForActiveMode(field, mode);
+                   if (!FieldFactory.getAllFieldsWithOutInternal().contains(canonicalField)) {
+                       return;
+                   }
+                   tabPane.getSelectionModel().select(allFieldsTab);
+                   allFieldsTab.addFieldAndFocus(canonicalField);
+               });
     }
 
     private void selectTabAndField(FieldsEditorTab tab, Field field) {
diff --git a/jablib/src/main/resources/l10n/JabRef_en.properties b/jablib/src/main/resources/l10n/JabRef_en.properties
index 70125e536a76..80ef10f831f4 100644
--- a/jablib/src/main/resources/l10n/JabRef_en.properties
+++ b/jablib/src/main/resources/l10n/JabRef_en.properties
@@ -916,7 +916,6 @@ Credential\ store\ not\ available.=Credential store not available.
 Show\ last\ names\ only=Show last names only
 
 Show\ all\ fields=Show all fields
-Enable\ the\ Main\ tab\ in\ Preferences\ >\ Entry\ editor\ to\ use\ jump-to-field=Enable the Main tab in Preferences > Entry editor to use jump-to-field
 
 Show\ less=Show less
 

From 785cd756a9a27666c3b16b795aa43b06f2287685 Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Fri, 28 Aug 2026 21:49:39 +0300
Subject: [PATCH 24/32] Refactor field focus handling to include alias field
 lookup

---
 .../org/jabref/gui/entryeditor/EntryEditorFocusUtils.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
index c10dc4309a35..483d4d793ccf 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
@@ -82,7 +82,13 @@ void setFocusToField(Field field) {
     void focusOrAddField(Field field) {
         UiTaskExecutor.runInJavaFXThread(() -> getTabContainingField(field).ifPresentOrElse(
                 tab -> selectTabAndField(tab, field),
-                () -> addFieldViaAllFieldsTab(field)
+                () -> {
+                    Field aliasField = EntryConverter.FIELD_ALIASES.get(field);
+                    getTabContainingField(aliasField).ifPresentOrElse(
+                            tab -> selectTabAndField(tab, aliasField),
+                            () -> addFieldViaAllFieldsTab(field)
+                    );
+                }
         ));
     }
 

From a970eae0bd7f67a95fed351d82d2cb90f493bf71 Mon Sep 17 00:00:00 2001
From: Abdelrhman <abdalrhmanmohamed94@gmail.com>
Date: Sat, 29 Aug 2026 19:08:04 +0300
Subject: [PATCH 25/32] Refactor duplicated focus-field logic

---
 .../gui/entryeditor/EntryEditorFocusUtils.java    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
index 483d4d793ccf..327521e9a5a4 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
@@ -70,23 +70,22 @@ void restoreLastFocusedField() {
     // region — jump to field
 
     void setFocusToField(Field field) {
-        UiTaskExecutor.runInJavaFXThread(() -> getTabContainingField(field).ifPresentOrElse(
-                tab -> selectTabAndField(tab, field),
-                () -> {
-                    Field aliasField = EntryConverter.FIELD_ALIASES.get(field);
-                    getTabContainingField(aliasField).ifPresent(tab -> selectTabAndField(tab, aliasField));
-                }
-        ));
+        focusField(field, () -> {
+        });
     }
 
     void focusOrAddField(Field field) {
+        focusField(field, () -> addFieldViaAllFieldsTab(field));
+    }
+
+    private void focusField(Field field, Runnable onNotFound) {
         UiTaskExecutor.runInJavaFXThread(() -> getTabContainingField(field).ifPresentOrElse(
                 tab -> selectTabAndField(tab, field),
                 () -> {
                     Field aliasField = EntryConverter.FIELD_ALIASES.get(field);
                     getTabContainingField(aliasField).ifPresentOrElse(
                             tab -> selectTabAndField(tab, aliasField),
-                            () -> addFieldViaAllFieldsTab(field)
+                            onNotFound
                     );
                 }
         ));

From 7def69b3f68de10654558b0063889991984646de Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 7 Sep 2026 20:32:44 +0200
Subject: [PATCH 26/32] Open the entry editor when jumping to a field

Ctrl+J did nothing when an entry was selected while the entry editor was
closed. It now opens the editor before showing the jump-to-field dialog.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Q4tFFzyEkmqSEVoEoyuvze
---
 jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java b/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java
index 472d7da43ad7..338ffae9aae1 100644
--- a/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java
+++ b/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java
@@ -404,7 +404,9 @@ private void initKeyBindings() {
                         break;
                     case JUMP_TO_FIELD:
                         // Handled here so that it also fires when the keyboard focus is outside the entry editor
-                        if (stateManager.getEditorShowing().get()) {
+                        if (!stateManager.getSelectedEntries().isEmpty()) {
+                            // Jumping to a field is only meaningful with a visible editor, so open it if it is closed
+                            stateManager.getEditorShowing().set(true);
                             entryEditor.openJumpToFieldDialog();
                             event.consume();
                         }

From 190841ee3188f9a29acdca2f1669ceb740fd1f2a Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 7 Sep 2026 21:13:59 +0200
Subject: [PATCH 27/32] Make Enter in the jump-to-field dialog jump on the
 first press

While the suggestion popup is open it receives Enter, so the dialog's OK
button never fired and the jump silently did nothing. The completion event
now confirms the dialog, and suggestions match by prefix instead of by
substring, so the preselected suggestion is the one that was typed.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Q4tFFzyEkmqSEVoEoyuvze
---
 .../gui/entryeditor/JumpToFieldDialog.java    | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldDialog.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldDialog.java
index 1f0e3a7ee9b5..35e12fe8fdcb 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldDialog.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldDialog.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.entryeditor;
 
+import java.util.Locale;
+
 import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -10,6 +12,7 @@
 import org.jabref.logic.l10n.Localization;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import org.controlsfx.control.textfield.AutoCompletionBinding;
 import org.controlsfx.control.textfield.TextFields;
 
 public class JumpToFieldDialog extends BaseDialog<Void> {
@@ -29,7 +32,9 @@ public JumpToFieldDialog(EntryEditor entryEditor) {
 
         this.setResultConverter(button -> {
             if (button == ButtonType.OK) {
-                jumpToSelectedField();
+                // Closing the dialog restores focus to whatever had it before, which would undo the
+                // focus the jump puts on the field. Therefore jump only once the dialog is gone.
+                Platform.runLater(this::jumpToSelectedField);
             }
             return null;
         });
@@ -41,17 +46,32 @@ public JumpToFieldDialog(EntryEditor entryEditor) {
     private void initialize() {
         viewModel = new JumpToFieldViewModel(this.entryEditor);
         searchField.textProperty().bindBidirectional(viewModel.searchTextProperty());
-        TextFields.bindAutoCompletion(searchField, viewModel.getFieldNames());
+
+        // Prefix matching instead of ControlsFX' default substring matching: the popup always preselects
+        // its first suggestion, so "file" would offer (and jump to) "dayfiled" first.
+        AutoCompletionBinding<String> autoCompletion = TextFields.bindAutoCompletion(searchField, request -> {
+            String userText = request.getUserText().toLowerCase(Locale.ROOT);
+            return viewModel.getFieldNames().stream()
+                            .filter(fieldName -> fieldName.toLowerCase(Locale.ROOT).startsWith(userText))
+                            .toList();
+        });
+        // The open suggestion popup swallows Enter, so the dialog never sees it: jump on the
+        // completion event instead. This also makes clicking a suggestion jump right away.
+        autoCompletion.setOnAutoCompleted(_ -> confirm());
 
         searchField.setOnAction(event -> {
-            Button okButton = (Button) getDialogPane().lookupButton(ButtonType.OK);
-            if (okButton != null) {
-                okButton.fire();
-            }
+            confirm();
             event.consume();
         });
     }
 
+    private void confirm() {
+        Button okButton = (Button) getDialogPane().lookupButton(ButtonType.OK);
+        if (okButton != null) {
+            okButton.fire();
+        }
+    }
+
     private void jumpToSelectedField() {
         String selectedField = searchField.getText();
 

From 3a30381c730f9f69eb343b9d76a8a9df656bc63d Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 7 Sep 2026 21:19:13 +0200
Subject: [PATCH 28/32] Tell the user when jumping to a field creates it

A field name that does not exist yet was silently ignored. It is now created
like the free-form add row does, and the dialog says so under the input while
such a name is typed.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Q4tFFzyEkmqSEVoEoyuvze
---
 CHANGELOG.md                                          |  2 +-
 .../jabref/gui/entryeditor/EntryEditorFocusUtils.java |  4 +---
 .../org/jabref/gui/entryeditor/JumpToFieldDialog.java |  7 +++++++
 .../jabref/gui/entryeditor/JumpToFieldViewModel.java  | 11 +++++++++++
 .../org/jabref/gui/entryeditor/JumpToFieldDialog.fxml |  4 +++-
 jablib/src/main/resources/l10n/JabRef_en.properties   |  1 +
 6 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ab25859fe1a..dda3866b5b8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -171,7 +171,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We fixed an issue where the button shape changed when hovering over it. [#16188](https://github.com/JabRef/jabref/issues/16188)
 - We fixed handling of `exit` in the LSP server. [#16268](https://github.com/JabRef/jabref/pull/16268)
 - We fixed an issue where `LinkedFile.isOnlineLink()` did not recognize `ftp://` links as online links. [#16400](https://github.com/JabRef/jabref/issues/16400)
-- We fixed an issue where the "Jump to field" dialog only searched fields already shown in the entry editor. It now searches all known fields and adds the selected field if it is not yet visible. [#16593](https://github.com/JabRef/jabref/issues/16593)
+- We fixed an issue where the "Jump to field" dialog only searched fields already shown in the entry editor. It now searches all known fields, adds the selected field if it is not yet visible, and creates the field if it does not exist yet. [#16593](https://github.com/JabRef/jabref/issues/16593)
 - We fixed an issue where deleting an entry removed the group filter and defaulted to the home view. [#16036](https://github.com/JabRef/jabref/issues/16036)
 
 ### Removed
diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
index 327521e9a5a4..2acbf05a5bc2 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
@@ -113,10 +113,8 @@ private void addFieldViaAllFieldsTab(Field field) {
                .findFirst()
                .ifPresent(allFieldsTab -> {
                    BibDatabaseMode mode = allFieldsTab.getDatabaseMode();
+                   // Custom field names are added as they are typed, like the tab's free-form add row does.
                    Field canonicalField = canonicalFieldForActiveMode(field, mode);
-                   if (!FieldFactory.getAllFieldsWithOutInternal().contains(canonicalField)) {
-                       return;
-                   }
                    tabPane.getSelectionModel().select(allFieldsTab);
                    allFieldsTab.addFieldAndFocus(canonicalField);
                });
diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldDialog.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldDialog.java
index 35e12fe8fdcb..93a60b5ba505 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldDialog.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldDialog.java
@@ -3,9 +3,11 @@
 import java.util.Locale;
 
 import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
+import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 
 import org.jabref.gui.util.BaseDialog;
@@ -17,6 +19,7 @@
 
 public class JumpToFieldDialog extends BaseDialog<Void> {
     @FXML private TextField searchField;
+    @FXML private Label newFieldHint;
     private final EntryEditor entryEditor;
     private JumpToFieldViewModel viewModel;
 
@@ -59,6 +62,10 @@ private void initialize() {
         // completion event instead. This also makes clicking a suggestion jump right away.
         autoCompletion.setOnAutoCompleted(_ -> confirm());
 
+        newFieldHint.managedProperty().bind(newFieldHint.visibleProperty());
+        newFieldHint.visibleProperty().bind(Bindings.createBooleanBinding(
+                () -> viewModel.isNewField(searchField.getText()), searchField.textProperty()));
+
         searchField.setOnAction(event -> {
             confirm();
             event.consume();
diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldViewModel.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldViewModel.java
index 98d1c57a6070..6dd7643919b1 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/JumpToFieldViewModel.java
@@ -7,6 +7,7 @@
 import javafx.beans.property.StringProperty;
 
 import org.jabref.gui.AbstractViewModel;
+import org.jabref.logic.util.strings.StringUtil;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
@@ -38,6 +39,16 @@ public List<String> getFieldNames() {
                                      .toList();
     }
 
+    /// `true` when jumping to `fieldName` would add a field the entry editor does not offer,
+    /// that is: a custom field that does not exist yet.
+    public boolean isNewField(String fieldName) {
+        if (StringUtil.isBlank(fieldName)) {
+            return false;
+        }
+        String normalizedFieldName = fieldName.trim();
+        return getFieldNames().stream().noneMatch(normalizedFieldName::equalsIgnoreCase);
+    }
+
     private List<Field> suggestedFields(BibEntry entry) {
         List<Field> suggestedFields = new ArrayList<>();
         suggestedFields.add(InternalField.KEY_FIELD);
diff --git a/jabgui/src/main/resources/org/jabref/gui/entryeditor/JumpToFieldDialog.fxml b/jabgui/src/main/resources/org/jabref/gui/entryeditor/JumpToFieldDialog.fxml
index 553fe8f84d8c..83aea3d48cd8 100644
--- a/jabgui/src/main/resources/org/jabref/gui/entryeditor/JumpToFieldDialog.fxml
+++ b/jabgui/src/main/resources/org/jabref/gui/entryeditor/JumpToFieldDialog.fxml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.VBox?>
 <DialogPane prefWidth="300" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1"
             fx:controller="org.jabref.gui.entryeditor.JumpToFieldDialog">
     <content>
-        <VBox>
+        <VBox spacing="4">
             <TextField fx:id="searchField" promptText="%Type a field name"/>
+            <Label fx:id="newFieldHint" text="%Field will be created"/>
         </VBox>
     </content>
 </DialogPane>
diff --git a/jablib/src/main/resources/l10n/JabRef_en.properties b/jablib/src/main/resources/l10n/JabRef_en.properties
index fb95f4e18e14..a8e1084dcc6c 100644
--- a/jablib/src/main/resources/l10n/JabRef_en.properties
+++ b/jablib/src/main/resources/l10n/JabRef_en.properties
@@ -338,6 +338,7 @@ Field\ names=Field names
 New\ field\ name=New field name
 Add\ new\ field\ name=Add new field name
 Field\ name\ \"%0\"\ already\ exists=Field name "%0" already exists
+Field\ will\ be\ created=Field will be created
 No\ field\ name\ selected\!=No field name selected!
 Remove\ field=Remove field
 Remove\ field\ name=Remove field name

From 2dff09183feda09e2b7d4d9fc17629016fbfc862 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 7 Sep 2026 21:24:02 +0200
Subject: [PATCH 29/32] Say why a jump does nothing when the Main tab is hidden

No other tab can show a field it was not configured for, so with the Main tab
hidden in the preferences the jump had no place to go and was dropped without
a word.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Q4tFFzyEkmqSEVoEoyuvze
---
 .../org/jabref/gui/entryeditor/EntryEditor.java   |  2 +-
 .../gui/entryeditor/EntryEditorFocusUtils.java    | 15 ++++++++++++---
 .../src/main/resources/l10n/JabRef_en.properties  |  1 +
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index ca0c3580d0c4..6032b5db5b6d 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -151,7 +151,7 @@ public EntryEditor(Supplier<LibraryTab> tabSupplier, UndoAction undoAction, Redo
         typeLabel.textProperty().bind(viewModel.typeLabelTextProperty());
         Bindings.bindContent(tabbed.getTabs(), viewModel.visibleTabs());
 
-        this.focusUtils = new EntryEditorFocusUtils(tabbed, this);
+        this.focusUtils = new EntryEditorFocusUtils(tabbed, this, dialogService);
 
         setupKeyBindings();
         setupDragAndDrop();
diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
index 2acbf05a5bc2..402c0f9e1cd7 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
@@ -14,10 +14,13 @@
 import javafx.scene.input.KeyEvent;
 
 import org.jabref.gui.util.UiTaskExecutor;
+import org.jabref.logic.util.NotificationService;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.EntryConverter;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
+import org.jabref.model.entry.field.FieldTextMapper;
 
 import org.jspecify.annotations.Nullable;
 
@@ -29,12 +32,14 @@ class EntryEditorFocusUtils {
 
     private final TabPane tabPane;
     private final Node sceneSource;
+    private final NotificationService notificationService;
 
     private @Nullable Field lastFocusedField;
 
-    EntryEditorFocusUtils(TabPane tabPane, Node sceneSource) {
+    EntryEditorFocusUtils(TabPane tabPane, Node sceneSource, NotificationService notificationService) {
         this.tabPane = tabPane;
         this.sceneSource = sceneSource;
+        this.notificationService = notificationService;
     }
 
     // region — field focus capture / restore
@@ -111,13 +116,17 @@ private void addFieldViaAllFieldsTab(Field field) {
                .filter(AllFieldsTab.class::isInstance)
                .map(AllFieldsTab.class::cast)
                .findFirst()
-               .ifPresent(allFieldsTab -> {
+               .ifPresentOrElse(allFieldsTab -> {
                    BibDatabaseMode mode = allFieldsTab.getDatabaseMode();
                    // Custom field names are added as they are typed, like the tab's free-form add row does.
                    Field canonicalField = canonicalFieldForActiveMode(field, mode);
                    tabPane.getSelectionModel().select(allFieldsTab);
                    allFieldsTab.addFieldAndFocus(canonicalField);
-               });
+               },
+               // No other tab can show a field it was not configured for, so say why nothing happens
+               // instead of swallowing the jump.
+               () -> notificationService.notify(Localization.lang("Cannot show \"%0\" because the \"%1\" tab is hidden",
+                       FieldTextMapper.getDisplayName(field), EntryEditorTabModel.BuiltIn.ALL_FIELDS.displayName())));
     }
 
     private void selectTabAndField(FieldsEditorTab tab, Field field) {
diff --git a/jablib/src/main/resources/l10n/JabRef_en.properties b/jablib/src/main/resources/l10n/JabRef_en.properties
index a8e1084dcc6c..80bcf016d3e6 100644
--- a/jablib/src/main/resources/l10n/JabRef_en.properties
+++ b/jablib/src/main/resources/l10n/JabRef_en.properties
@@ -339,6 +339,7 @@ New\ field\ name=New field name
 Add\ new\ field\ name=Add new field name
 Field\ name\ \"%0\"\ already\ exists=Field name "%0" already exists
 Field\ will\ be\ created=Field will be created
+Cannot\ show\ \"%0\"\ because\ the\ \"%1\"\ tab\ is\ hidden=Cannot show "%0" because the "%1" tab is hidden
 No\ field\ name\ selected\!=No field name selected!
 Remove\ field=Remove field
 Remove\ field\ name=Remove field name

From 8a8786424947caf094d42f9c1e37271c1329c2d1 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 7 Sep 2026 21:29:54 +0200
Subject: [PATCH 30/32] Apply IntelliJ formatting

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Q4tFFzyEkmqSEVoEoyuvze
---
 .../entryeditor/EntryEditorFocusUtils.java    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
index a4eba3797610..2b6689ed8249 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
@@ -117,16 +117,16 @@ private void addFieldViaAllFieldsTab(Field field) {
                .map(AllFieldsTab.class::cast)
                .findFirst()
                .ifPresentOrElse(allFieldsTab -> {
-                   BibDatabaseMode mode = allFieldsTab.getDatabaseMode();
-                   // Custom field names are added as they are typed, like the tab's free-form add row does.
-                   Field canonicalField = canonicalFieldForActiveMode(field, mode);
-                   tabPane.getSelectionModel().select(allFieldsTab);
-                   allFieldsTab.addFieldAndFocus(canonicalField);
-               },
-               // No other tab can show a field it was not configured for, so say why nothing happens
-               // instead of swallowing the jump.
-               () -> notificationService.notify(Localization.lang("Cannot show \"%0\" because the \"%1\" tab is hidden",
-                       FieldTextMapper.getDisplayName(field), EntryEditorTabModel.BuiltIn.ALL_FIELDS.displayName())));
+                           BibDatabaseMode mode = allFieldsTab.getDatabaseMode();
+                           // Custom field names are added as they are typed, like the tab's free-form add row does.
+                           Field canonicalField = canonicalFieldForActiveMode(field, mode);
+                           tabPane.getSelectionModel().select(allFieldsTab);
+                           allFieldsTab.addFieldAndFocus(canonicalField);
+                       },
+                       // No other tab can show a field it was not configured for, so say why nothing happens
+                       // instead of swallowing the jump.
+                       () -> notificationService.notify(Localization.lang("Cannot show \"%0\" because the \"%1\" tab is hidden",
+                               FieldTextMapper.getDisplayName(field), EntryEditorTabModel.BuiltIn.ALL_FIELDS.displayName())));
     }
 
     private void selectTabAndField(FieldsEditorTab tab, Field field) {

From 4af0f8bc7e294f4e75bc1c4cc95edadec34de68b Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 7 Sep 2026 21:37:47 +0200
Subject: [PATCH 31/32] Fix import order

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Q4tFFzyEkmqSEVoEoyuvze
---
 .../java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
index 2b6689ed8249..bcaf5ac52b15 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/EntryEditorFocusUtils.java
@@ -14,8 +14,8 @@
 import javafx.scene.input.KeyEvent;
 
 import org.jabref.gui.util.UiTaskExecutor;
-import org.jabref.logic.util.NotificationService;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.NotificationService;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.EntryConverter;
 import org.jabref.model.entry.field.Field;

From 3834d795cc347ba52cb88261f0458f27dd4a7240 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 7 Sep 2026 21:50:10 +0200
Subject: [PATCH 32/32] Explain why the section panes are cleared before a
 layout pass

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Q4tFFzyEkmqSEVoEoyuvze
---
 .../src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java b/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
index c4c3c7fed3cb..8f5c54bfc026 100644
--- a/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/entryeditor/AllFieldsTab.java
@@ -321,6 +321,8 @@ public void requestFocus(Field fieldName) {
     /// tab height.
     @Override
     protected void layoutEditors(BibDatabaseContext bibDatabaseContext, BibEntry entry, boolean compressed, List<Label> labels) {
+        // Every layout pass builds fresh TitledPanes, so the ones tracked from the previous pass are
+        // detached from the scene graph: expanding one (requestFocus) would do nothing visible.
         sectionPanes.clear();
         // labels were created in editors-map iteration order (see FieldsEditorTab#setupPanel)
         Map<Field, Label> labelForField = new LinkedHashMap<>();