Index: trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java	(revision 12260)
+++ trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java	(revision 12265)
@@ -91,4 +91,5 @@
      */
     public Map<String, String> getTags(boolean keepEmpty) {
+        forceCommentFieldReload();
         return pnlTagEditor.getModel().getTags(keepEmpty);
     }
@@ -108,4 +109,12 @@
         changesetCommentModel.setComment(getTagEditorValue("comment"));
         changesetSourceModel.setComment(getTagEditorValue("source"));
+    }
+
+    /**
+     * Force update the fields if the user is currently changing them. See #5676
+     */
+    private void forceCommentFieldReload() {
+        setProperty("comment", changesetCommentModel.getComment());
+        setProperty("source", changesetSourceModel.getComment());
     }