diff --git a/geonode_mapstore_client/client/themes/geonode/less/ms-theme.less b/geonode_mapstore_client/client/themes/geonode/less/ms-theme.less
index 15fc1c8a95..28614c0913 100644
--- a/geonode_mapstore_client/client/themes/geonode/less/ms-theme.less
+++ b/geonode_mapstore_client/client/themes/geonode/less/ms-theme.less
@@ -31,3 +31,16 @@
         flex: 1;
     }
 }
+
+// mapstore compute this value using @square-btn-size and @font-size-h4
+// in this specific context those value have different uom
+// we should override this to ensure to use rem and have the correct value for padding
+.ms-resizable-modal > .modal-content > .modal-header {
+    height: (@font-size-h4 * 3);
+    padding: @font-size-h4;
+}
+// the input small size is not computed correctly due to rem value
+// this override will fix the attribute table filter inputs
+.input-sm {
+    height: 1.75rem;
+}