diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx
index 2e09bbe1..f053440a 100644
--- a/components/email/email-composer.tsx
+++ b/components/email/email-composer.tsx
@@ -760,8 +760,12 @@ export function EmailComposer({
     sigInsertedRef.current = true;
     if (mode === 'compose') {
       editor.chain().focus('end').insertContent(`<p></p>${sig.body}`).run();
+      // Place the caret in the empty paragraph above the signature so the user
+      // starts typing at the top of the new email.
+      editor.chain().focus('start').run();
     } else if ((mode === 'reply' || mode === 'replyAll' || mode === 'forward') && signaturePosition === 'above_quote') {
-      editor.chain().focus('start').insertContent(sig.body).run();
+      editor.chain().focus('start').insertContent(`<p></p>${sig.body}`).run();
+      editor.chain().focus('start').run();
     }
   }, [selectedSignatureId, plainTextMode, mode, signaturePosition, getSignatureById, editorReady]);