diff --git a/app/javascript/template_builder/dynamic_editor.js b/app/javascript/template_builder/dynamic_editor.js
index 85c9acd94..cad495254 100644
--- a/app/javascript/template_builder/dynamic_editor.js
+++ b/app/javascript/template_builder/dynamic_editor.js
@@ -27,13 +27,17 @@ tiptapStylesheet.replaceSync(
   font-feature-settings: "liga" 0;
   display: flex;
   flex-flow: column nowrap;
-  min-height: inherit;
+  flex-grow: 1;
 }
 
-.ProseMirror > article {
+.ProseMirror > article:last-of-type {
   margin-bottom: auto;
 }
 
+.ProseMirror p.doc-trailing-break::after {
+  content: none;
+}
+
 .ProseMirror [contenteditable="false"] {
   white-space: normal;
 }