diff --git a/resources/report/html/loot-plugin-card.html b/resources/report/html/loot-plugin-card.html
index 1ea0b308..d33bda25 100644
--- a/resources/report/html/loot-plugin-card.html
+++ b/resources/report/html/loot-plugin-card.html
@@ -353,6 +353,7 @@ loot-clear-metadata
             /* If the editor hasn't already been opened, its data is not yet set, so do that now. */
             if (!card.data.isEditorOpen && !card.data.editor) {
                 card.shadowRoot.getElementById('editor').data = card.data;
+                card.shadowRoot.getElementById('editor').setEditorData(card.data);
             }
 
             card.data.isEditorOpen = true;
diff --git a/resources/report/js/events.js b/resources/report/js/events.js
index 9bacab53..66017fc3 100644
--- a/resources/report/js/events.js
+++ b/resources/report/js/events.js
@@ -494,6 +494,7 @@ function onEditorClose(evt) {
         /* Don't need to record changes, but still need to notify C++ side that
            the editor has been closed. */
         loot.query('editorClosed').catch(processCefError);
+        delete evt.target.data.editor;
     }
 
     /* Now hide editor. */