diff --git a/apps/twig/src/renderer/features/message-editor/tiptap/useTiptapEditor.ts b/apps/twig/src/renderer/features/message-editor/tiptap/useTiptapEditor.ts
index 19067eb20..fb8ad0b05 100644
--- a/apps/twig/src/renderer/features/message-editor/tiptap/useTiptapEditor.ts
+++ b/apps/twig/src/renderer/features/message-editor/tiptap/useTiptapEditor.ts
@@ -292,6 +292,8 @@ export function useTiptapEditor(options: UseTiptapEditorOptions) {
         }
 
         draftRef.current?.saveDraft(e);
+
+        e.commands.scrollIntoView();
       },
     },
     [sessionId, disabled, fileMentions, commands, placeholder],