diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index 4fbd1b47e94..dc098bb6d13 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -1510,7 +1510,7 @@ public void showAndEdit(BibEntry entry) {
             entryEditor.setEntry(entry);
             newEntryShowing(entry);
         }
-        entryEditor.requestFocus();
+        DefaultTaskExecutor.runInJavaFXThread(() -> entryEditor.requestFocus());
         adjustSplitter();
     }