diff --git a/umap/static/umap/base.css b/umap/static/umap/base.css
index 13719a88..83871022 100644
--- a/umap/static/umap/base.css
+++ b/umap/static/umap/base.css
@@ -506,7 +506,6 @@ i.info {
 .umap-edit-container,
 .umap-datalayer-container,
 .umap-layer-properties-container,
-.umap-footer-container,
 .umap-browse-data,
 .umap-filter-data,
 .umap-browse-datalayers {
diff --git a/umap/static/umap/js/umap.popup.js b/umap/static/umap/js/umap.popup.js
index b6eb317f..b65807f0 100644
--- a/umap/static/umap/js/umap.popup.js
+++ b/umap/static/umap/js/umap.popup.js
@@ -116,12 +116,7 @@ L.U.PopupTemplate.Default = L.Class.extend({
 
   renderFooter: function () {
     if (this.feature.hasPopupFooter()) {
-      const footerContainer = L.DomUtil.create(
-          'div',
-          'umap-footer-container',
-          this.container
-        ),
-        footer = L.DomUtil.create('ul', 'umap-popup-footer', footerContainer),
+      const footer = L.DomUtil.create('ul', 'umap-popup-footer', this.container),
         previousLi = L.DomUtil.create('li', 'previous', footer),
         zoomLi = L.DomUtil.create('li', 'zoom', footer),
         nextLi = L.DomUtil.create('li', 'next', footer),
diff --git a/umap/static/umap/map.css b/umap/static/umap/map.css
index ca1c00d1..b303047d 100644
--- a/umap/static/umap/map.css
+++ b/umap/static/umap/map.css
@@ -1317,7 +1317,6 @@ a.add-datalayer:hover,
 }
 .leaflet-popup-content-wrapper {
     border-radius: 4px;
-    overflow-y: scroll;
 }
 .umap-popup-content {
     max-height: 500px;
@@ -1325,6 +1324,7 @@ a.add-datalayer:hover,
     margin-bottom: 4px;
     display: flex;
     flex-direction: column;
+    overflow-y: scroll;
 }
 .umap-popup-content iframe {
     min-width: 310px;