diff --git a/src/styles/_popup.scss b/src/styles/_popup.scss
index 2338f89..f9aab49 100644
--- a/src/styles/_popup.scss
+++ b/src/styles/_popup.scss
@@ -28,6 +28,8 @@
 }
 
 .maputnik-feature-property-popup {
+  max-height: calc(50vh - 40px); /* toolbar height: 40px */
+  overflow-y: auto;
   .maputnik-input-block {
     margin: 0;
     margin-left: $margin-2;