diff --git a/docs/changelog.rst b/docs/changelog.rst
index 76951a541..051d860dc 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -32,6 +32,9 @@ New features:
 
 Bug fixes:
 
+- When using :doc:`plugins/fromfilename` together with
+  :doc:`plugins/edit`, temporary tags extracted from filenames are no longer
+  lost when discarding or cancelling an edit session during import. :bug:`6104`
 - :doc:`plugins/inline`: Fix recursion error when an inline field definition
   shadows a built-in item field (e.g., redefining ``track_no``). Inline
   expressions now skip self-references during evaluation to avoid infinite