diff --git a/assets/global.js b/assets/global.js
index ce13bf6514a..657227444f3 100644
--- a/assets/global.js
+++ b/assets/global.js
@@ -619,6 +619,7 @@ class ModalDialog extends HTMLElement {
   connectedCallback() {
     if (this.moved) return;
     this.moved = true;
+    this.dataset.section = this.closest('.shopify-section').id.replace('shopify-section-', '');
     document.body.appendChild(this);
   }
 
diff --git a/assets/theme-editor.js b/assets/theme-editor.js
index 557c908a3b3..62f96c073e8 100644
--- a/assets/theme-editor.js
+++ b/assets/theme-editor.js
@@ -36,6 +36,12 @@ document.addEventListener('shopify:section:load', () => {
   }
 });
 
+document.addEventListener('shopify:section:unload', (event) => {
+  document.querySelectorAll(`[data-section="${event.detail.sectionId}"]`).forEach((element) => {
+    element.remove();
+  });
+});
+
 document.addEventListener('shopify:section:reorder', () => hideProductModal());
 
 document.addEventListener('shopify:section:select', () => hideProductModal());