diff --git a/src/components/editor/MentionEditor.tsx b/src/components/editor/MentionEditor.tsx
index 7fadd8a..60b81b9 100644
--- a/src/components/editor/MentionEditor.tsx
+++ b/src/components/editor/MentionEditor.tsx
@@ -820,8 +820,7 @@ export const MentionEditor = forwardRef<
       extensions,
       editorProps: {
         attributes: {
-          class:
-            "prose prose-sm max-w-none focus:outline-none min-h-[1.25rem] px-2 py-1 whitespace-nowrap text-sm",
+          class: "prose prose-sm max-w-none focus:outline-none text-sm",
         },
       },
       autofocus: autoFocus,
@@ -887,11 +886,11 @@ 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 h-7 flex items-center overflow-hidden px-2 ${className}`}
       >
         <EditorContent
           editor={editor}
-          className="flex-1 min-w-0 overflow-x-auto"
+          className="flex-1 min-w-0 flex items-center"
         />
       </div>
     );
diff --git a/src/index.css b/src/index.css
index 9684d61..024a54a 100644
--- a/src/index.css
+++ b/src/index.css
@@ -281,7 +281,9 @@ body.animating-layout
 
 /* TipTap Editor Styles */
 .ProseMirror {
-  min-height: 2rem;
+  min-height: 1.25rem;
+  display: flex;
+  align-items: center;
 }
 
 .ProseMirror:focus {
@@ -290,14 +292,14 @@ body.animating-layout
 
 .ProseMirror p {
   margin: 0;
+  flex: 1;
+  min-width: 0;
 }
 
 .ProseMirror p.is-editor-empty:first-child::before {
   content: attr(data-placeholder);
-  float: left;
   color: hsl(var(--muted-foreground));
   pointer-events: none;
-  height: 0;
 }
 
 /* Mention styles */