diff --git a/src/styles/_popup.scss b/src/styles/_popup.scss
index 27a2f9eb..5f003778 100644
--- a/src/styles/_popup.scss
+++ b/src/styles/_popup.scss
@@ -28,7 +28,7 @@
 }
 
 .maputnik-feature-property-popup {
-  max-height: 500px;
+  max-height: calc(100vh - 40px - 40px); /* toolbar height: 40px, padding: 40px */
   overflow-y: auto;
   .maputnik-input-block {
     margin: 0;