diff --git a/wagtailio/static/sass/components/_headline.scss b/wagtailio/static/sass/components/_headline.scss
index 38e35a524..9c02c7369 100644
--- a/wagtailio/static/sass/components/_headline.scss
+++ b/wagtailio/static/sass/components/_headline.scss
@@ -43,6 +43,19 @@
             padding-top: $gutter-lg;
         }
     }
+    @include media-query(small) {
+        &__heading {
+            display: inline-block;
+            background-color: color-mix(
+                in srgb,
+                var(--color-background) 70%,
+                transparent
+            );
+            padding: 0.25em 0.5em;
+            border-radius: 4px;
+        }
+    }
+
 
     &__subheading {
         margin-bottom: 20px;
diff --git a/wagtailio/static/sass/layout/_header.scss b/wagtailio/static/sass/layout/_header.scss
index 3b05abaf1..25c546476 100644
--- a/wagtailio/static/sass/layout/_header.scss
+++ b/wagtailio/static/sass/layout/_header.scss
@@ -85,7 +85,8 @@
             &.is-visible {
                 visibility: visible;
                 transform: translateZ(0);
-                overflow-y: scroll;
+                max-height: calc(100vh - #{$header-mobile-height});
+                overflow-y: auto;
             }
         }
     }