diff --git a/modules/ROOT/pages/8.4.0-release-notes.adoc b/modules/ROOT/pages/8.4.0-release-notes.adoc
index 9d8d4ba772..6adc84b94a 100644
--- a/modules/ROOT/pages/8.4.0-release-notes.adoc
+++ b/modules/ROOT/pages/8.4.0-release-notes.adoc
@@ -158,6 +158,13 @@ For information on using Enhanced Skins & Icon Packs, see: xref:enhanced-skins-a
 
 // CCFR here.
 
+=== Dialogs did not retain focus when using the block/unblock API.
+// #TINY-12918
+
+Previously, when a dialog was blocked (for example, while loading) and then unblocked, the loading spinner disappeared without automatically focusing any other element. As a result, focus escaped the editor entirely. When using an inline editor, this caused the dialog and the rest of the editor UI to disappear.
+
+In {productname} {release-version}, unblocking a dialog now focuses the first focusable element automatically, the same as when opening a dialog. This prevents the dialog and the rest of the editor UI from disappearing when using an inline editor.
+
 
 [[security-fixes]]
 == Security fixes