diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b556eb4a6c..231d8ec12f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,9 +24,9 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 
 ### Fixed
  - We fixed an issue where JabRef would not terminated after asking to collect anonymous statistics [#2955 comment](https://github.com/JabRef/jabref/issues/2955#issuecomment-334591123)
- - We fixed an issue where JabRef would not shut down when started with the '-n' (No GUI) option.
+ - We fixed an issue where JabRef would not shut down when started with the '-n' (No GUI) option. [#3247](https://github.com/JabRef/jabref/issues/3247)
  - We improved the way metadata is updated in remote databases. [#3235](https://github.com/JabRef/jabref/issues/3235)
-
+ - We fixed an issue where JabRef would freeze when trying to replace the original entry after a merge with new information from identifiers like DOI/ISBN etc. [3294](https://github.com/JabRef/jabref/issues/3294)
 ### Removed
 
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 4ff62fad14e..77fac58979e 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -234,7 +234,7 @@ public synchronized void listen(FieldAddedOrRemovedEvent event) {
 
     @Subscribe
     public synchronized void listen(EntryChangedEvent event) {
-        sourceTab.updateSourcePane();
+        DefaultTaskExecutor.runInJavaFXThread(() -> sourceTab.updateSourcePane());
     }
 
     private void rebuildOtherFieldsTab() {