diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index db45afc6678..f8823cb493b 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -23,19 +23,6 @@ html.composer-open {
     max-width: 740px;
   }
 
-  .with-form-template {
-    .toggle-preview,
-    #mobile-file-upload,
-    .submit-panel .mobile-preview {
-      display: none;
-    }
-
-    .d-editor-preview-wrapper {
-      display: none;
-      flex: 0;
-    }
-  }
-
   @media screen and (width <= 1200px) {
     min-width: 0;
   }
@@ -50,6 +37,22 @@ html.composer-open {
     flex-direction: column;
   }
 
+  .with-form-template {
+    overflow: auto;
+    flex: 1;
+
+    .toggle-preview,
+    #mobile-file-upload,
+    .submit-panel .mobile-preview {
+      display: none;
+    }
+
+    .d-editor-preview-wrapper {
+      display: none;
+      flex: 0;
+    }
+  }
+
   .saving-text,
   .draft-text {
     display: none;