diff --git a/src/components/editor/MentionEditor.tsx b/src/components/editor/MentionEditor.tsx
index bf09a10..85f1c36 100644
--- a/src/components/editor/MentionEditor.tsx
+++ b/src/components/editor/MentionEditor.tsx
@@ -875,12 +875,9 @@ export const MentionEditor = forwardRef<
 
     return (
       <div
-        className={`rounded border bg-background transition-colors focus-within:border-primary h-7 flex items-center overflow-hidden ${className}`}
+        className={`rounded border bg-background transition-colors focus-within:border-primary min-h-7 max-h-32 flex items-start overflow-y-auto overflow-x-hidden ${className}`}
       >
-        <EditorContent
-          editor={editor}
-          className="flex-1 min-w-0 overflow-x-auto"
-        />
+        <EditorContent editor={editor} className="flex-1 min-w-0" />
       </div>
     );
   },
diff --git a/src/index.css b/src/index.css
index 023cd8e..fd0068b 100644
--- a/src/index.css
+++ b/src/index.css
@@ -283,6 +283,7 @@ body.animating-layout
 .ProseMirror {
   min-height: 1.25rem;
   line-height: 1.25rem;
+  width: 100%;
 }
 
 .ProseMirror:focus {
@@ -292,6 +293,8 @@ body.animating-layout
 .ProseMirror p {
   margin: 0;
   line-height: 1.25rem;
+  word-wrap: break-word;
+  overflow-wrap: break-word;
 }
 
 .ProseMirror p.is-editor-empty:first-child::before {