diff --git a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/plugins/bookmarks.js b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/plugins/bookmarks.js
index 397006e..12d9662 100644
--- a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/plugins/bookmarks.js
+++ b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/plugins/bookmarks.js
@@ -266,6 +266,10 @@ function bmOpenForm(bm) {
   bmEditId = bm ? bm.id : null;
   bmEditScope = bm ? (bm.scope || bmScope) : null;
 
+  // Rebuild decoder checkboxes from registry (handles race where registry
+  // loaded after initial build).
+  bmBuildDecoderCheckboxes();
+
   document.getElementById("bm-id").value = bm ? bm.id : "";
   document.getElementById("bm-name").value = bm ? bm.name : "";
   document.getElementById("bm-freq").value = bm ? bm.freq_hz : "";