diff --git a/src/Lumi/Components/Modal.purs b/src/Lumi/Components/Modal.purs
index 64e46fe8..c8940184 100644
--- a/src/Lumi/Components/Modal.purs
+++ b/src/Lumi/Components/Modal.purs
@@ -456,8 +456,9 @@ styles = jss
 
                 -- non-dialog modals fill the screen on mobile devices
               , "&:not([data-variant=\"dialog\"])":
-                  { "& lumi-modal":
-                      { "@media (max-width: 860px)":
+                  { "@media (max-width: 860px)":
+                      { maxHeight: "100%"
+                      , "& lumi-modal":
                           { position: "fixed"
                           , top: "0"
                           , right: "0"
@@ -470,6 +471,10 @@ styles = jss
                           , "&[data-size=\"small\"], &[data-size=\"medium\"], &[data-size=\"large\"]":
                               { width: "100vw"
                               }
+                          , "& lumi-modal-content":
+                              { flex: "1 1 auto"
+                              , overflowY: "auto"
+                              }
                           }
                       }
                   }