diff --git a/src/styles/_modal.scss b/src/styles/_modal.scss
index 9f88f536..24f042b0 100644
--- a/src/styles/_modal.scss
+++ b/src/styles/_modal.scss
@@ -10,6 +10,12 @@
 .maputnik-modal-section {
   padding-top: $margin-3;
   padding-bottom: $margin-3;
+  display: flex;
+  flex-direction: column;
+}
+
+.maputnik-modal-section--fill {
+  flex: 1 1;
 }
 
 .maputnik-modal-header {
@@ -30,6 +36,9 @@
 
 .maputnik-modal-content {
   padding: $margin-3;
+  display: flex;
+  flex-direction: column;
+  max-height: 90vh;
 }
 
 .maputnik-modal-header-space {
@@ -68,6 +77,7 @@
 .maputnik-style-gallery-container {
   max-height: 400px;
   overflow-y: scroll;
+  flex: 1;
 }
 
 .maputnik-public-style {