diff --git a/umap/static/umap/js/umap.controls.js b/umap/static/umap/js/umap.controls.js
index 0c1bc9c1..06fd9e14 100644
--- a/umap/static/umap/js/umap.controls.js
+++ b/umap/static/umap/js/umap.controls.js
@@ -671,6 +671,9 @@ L.U.DataLayer.addInitHook(function () {
 L.U.Map.include({
   _openBrowser: function () {
     const browserContainer = L.DomUtil.create('div', 'umap-browse-data')
+    // HOTFIX. Remove when this is merged and released:
+    // https://github.com/Leaflet/Leaflet/pull/9052
+    L.DomEvent.disableClickPropagation(browserContainer)
 
     const title = L.DomUtil.add(
       'h3',
diff --git a/umap/static/umap/js/umap.popup.js b/umap/static/umap/js/umap.popup.js
index 173cba39..9fd96b3c 100644
--- a/umap/static/umap/js/umap.popup.js
+++ b/umap/static/umap/js/umap.popup.js
@@ -63,8 +63,8 @@ L.U.Popup.Panel = L.U.Popup.extend({
     return button
   },
 
-  update: function () {
-    this.feature.map.ui.openPanel({
+  onAdd: function (map) {
+    map.ui.openPanel({
       data: { html: this._content },
       actions: [this.allButton()],
     })
@@ -72,12 +72,9 @@ L.U.Popup.Panel = L.U.Popup.extend({
 
   onRemove: function (map) {
     map.ui.closePanel()
-    L.U.Popup.prototype.onRemove.call(this, map)
   },
 
-  _initLayout: function () {
-    this._container = L.DomUtil.create('span')
-  },
+  update: function () {},
   _updateLayout: function () {},
   _updatePosition: function () {},
   _adjustPan: function () {},