diff --git a/ghost/admin/app/components/modal-email-design-settings.hbs b/ghost/admin/app/components/modal-email-design-settings.hbs
index 924d7c097f..6cd4c7b236 100644
--- a/ghost/admin/app/components/modal-email-design-settings.hbs
+++ b/ghost/admin/app/components/modal-email-design-settings.hbs
@@ -116,15 +116,15 @@
                 </div>
             </div>
 
-            <div class="modal-fullsettings-preview-hidescrollbar">
-                <div class="modal-fullsettings-preview-container">
-                    <div class="gh-members-emailpreview-container">
-                        <div class="gh-members-emailpreview-faux">
-                            <p>
-                                <span class="strong">{{this.config.blogTitle}}</span> &lt;{{this.settings.membersFromAddress}}&gt;
-                            </p>
-                            <p><span class="dark">To:</span> Jamie Larson &lt;jamie@example.com&gt;</p>
-                        </div>
+            <div class="modal-fullsettings-preview-container gh-members-emailpreview">
+                <div class="gh-members-emailpreview-container">
+                    <div class="gh-members-emailpreview-faux">
+                        <p>
+                            <span class="strong">{{this.config.blogTitle}}</span> &lt;{{this.settings.membersFromAddress}}&gt;
+                        </p>
+                        <p><span class="dark">To:</span> Jamie Larson &lt;jamie@example.com&gt;</p>
+                    </div>
+                    <div class="gh-members-emailpreview-contents">
                         <div class="gh-members-emailpreview-header {{if (not this.showHeader) "hide"}}">
                             {{#if this.settings.icon}}
                                 <img src={{this.settings.icon}} />
diff --git a/ghost/admin/app/styles/layouts/members.css b/ghost/admin/app/styles/layouts/members.css
index c7552ca4a4..01846c8063 100644
--- a/ghost/admin/app/styles/layouts/members.css
+++ b/ghost/admin/app/styles/layouts/members.css
@@ -823,12 +823,18 @@ p.gh-members-import-errordetail:first-of-type {
     margin-top: -2px;
 }
 
+.gh-members-emailpreview {
+    overflow: hidden;
+    overflow-y: hidden;
+    overflow-x: hidden;
+}
+
 .gh-members-emailpreview-container {
     width: 100%;
     max-width: 520px;
     background: #fff;
     border-radius: 12px;
-    padding: 32px;
+    padding: 0;
     margin: 32px auto;
     box-shadow: 
         0 0 0 1px rgba(0,0,0,0.02),
@@ -844,6 +850,7 @@ p.gh-members-import-errordetail:first-of-type {
     transform-origin: top;
     pointer-events: none;
     cursor: auto;
+    overflow: hidden;
 }
 
 .gh-members-emailpreview-container a {
@@ -854,8 +861,12 @@ p.gh-members-import-errordetail:first-of-type {
 }
 
 .gh-members-emailpreview-faux {
-    margin: -32px -32px 16px;
-    padding: 16px 24px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    margin: 0;
+    height: 78px;
+    padding: 0 24px;
     border-bottom: 1px solid var(--lightgrey-d1);
     background: var(--white);
     border-top-left-radius: 12px;
@@ -878,6 +889,14 @@ p.gh-members-import-errordetail:first-of-type {
     color: var(--darkgrey);
 }
 
+.gh-members-emailpreview-contents {
+    overflow-x: hidden;
+    overflow-y: scroll;
+    margin: 0 -50px;
+    padding: 0 74px 30px;
+    max-height: calc(100vh - 66px - 64px - 60px);
+}
+
 .gh-members-emailpreview-header {
     display: flex;
     flex-direction: column;