diff --git a/umap/templates/umap/content.html b/umap/templates/umap/content.html
index 7ae6c00c..f3315db2 100644
--- a/umap/templates/umap/content.html
+++ b/umap/templates/umap/content.html
@@ -67,7 +67,7 @@
             const container = this.parentNode
             container.innerHTML = data
             Array.prototype.forEach.call(
-              container.querySelectorAll('script'),
+              container.querySelectorAll('script:not([type="application/json"])'),
               function (item) {
                 eval(item.firstChild.textContent)
               }
diff --git a/umap/templates/umap/user_dashboard.html b/umap/templates/umap/user_dashboard.html
index 3c4f897b..cb3d540a 100644
--- a/umap/templates/umap/user_dashboard.html
+++ b/umap/templates/umap/user_dashboard.html
@@ -28,12 +28,18 @@
   {{ block.super }}
   <script type="text/javascript">
     !(function () {
+      const CACHE = {}
       for (const mapOpener of document.querySelectorAll("button.map-opener")) {
         mapOpener.addEventListener('click', (event) => {
           event.target.nextElementSibling.showModal()
           const mapId = event.target.dataset.mapId
-          const previewSettings = JSON.parse(document.getElementById(mapId).textContent)
-          const map = new L.U.Map(`${mapId}_target`, previewSettings)
+          if (!document.querySelector(`#${mapId}_target`).hasChildNodes()) {
+            const previewSettings = JSON.parse(document.getElementById(mapId).textContent)
+            const map = new L.U.Map(`${mapId}_target`, previewSettings)
+            CACHE[mapId] = map
+          } else {
+            CACHE[mapId].invalidateSize()
+          }
         })
       }
     })()