diff --git a/web/src/compose.js b/web/src/compose.js
index a35534992c..7e5ff474b7 100644
--- a/web/src/compose.js
+++ b/web/src/compose.js
@@ -71,6 +71,8 @@ export function show_preview_area() {
         $("#compose .preview_content"),
         content,
     );
+    const edit_height = $compose_textarea.height();
+    $preview_message_area.css({"min-height": edit_height + "px"});
     $preview_message_area.show();
 }
 
diff --git a/web/src/message_edit.ts b/web/src/message_edit.ts
index 2ad8791cab..79b2ed63c4 100644
--- a/web/src/message_edit.ts
+++ b/web/src/message_edit.ts
@@ -1665,6 +1665,8 @@ export function show_preview_area($element: JQuery): void {
         $row.find(".preview_content"),
         content,
     );
+    const edit_height = $msg_edit_content.height();
+    $preview_message_area.css({"min-height": edit_height + "px"});
     $preview_message_area.show();
 }