diff --git a/desktop/src/components/chat/AssistantMessage.tsx b/desktop/src/components/chat/AssistantMessage.tsx
index 1d6d9d68..4bb938aa 100644
--- a/desktop/src/components/chat/AssistantMessage.tsx
+++ b/desktop/src/components/chat/AssistantMessage.tsx
@@ -64,14 +64,14 @@ export const AssistantMessage = memo(function AssistantMessage({ content, isStre
   const documentLayout = shouldUseDocumentLayout(content)
 
   return (
-    <div className="group mb-5 flex justify-start">
+    <div className="mb-5 flex justify-start">
       <div
         data-message-shell="assistant"
         data-layout={documentLayout ? 'document' : 'bubble'}
-        className={`flex min-w-0 flex-col items-start gap-2 ${
+        className={`group flex min-w-0 flex-col items-start gap-2 ${
           documentLayout
             ? 'w-full max-w-full'
-            : 'w-full max-w-[88%] sm:max-w-[80%] lg:max-w-[72%]'
+            : 'max-w-[88%] sm:max-w-[80%] lg:max-w-[72%]'
         }`}
       >
         <div className={`rounded-[20px] rounded-tl-[8px] border border-[var(--color-border)]/60 bg-[var(--color-surface)] px-4 py-3 text-sm text-[var(--color-text-primary)] shadow-sm ${
diff --git a/desktop/src/components/chat/MessageList.test.tsx b/desktop/src/components/chat/MessageList.test.tsx
index 8f225fc6..7d1498af 100644
--- a/desktop/src/components/chat/MessageList.test.tsx
+++ b/desktop/src/components/chat/MessageList.test.tsx
@@ -2725,8 +2725,12 @@ describe('MessageList nested tool calls', () => {
 
     expect(userShell).toBeTruthy()
     expect(userShell?.className).toContain('items-end')
+    expect(userShell?.className).toContain('group')
+    expect(userShell?.className).not.toContain('w-full')
     expect(assistantShell).toBeTruthy()
     expect(assistantShell?.className).toContain('items-start')
+    expect(assistantShell?.className).toContain('group')
+    expect(assistantShell?.className).not.toContain('w-full')
     expect(assistantShell?.className).not.toContain('ml-10')
     expect(userActions?.getAttribute('data-align')).toBe('end')
     expect(assistantActions?.getAttribute('data-align')).toBe('start')
diff --git a/desktop/src/components/chat/UserMessage.tsx b/desktop/src/components/chat/UserMessage.tsx
index 3dbb5d1b..6aa0576d 100644
--- a/desktop/src/components/chat/UserMessage.tsx
+++ b/desktop/src/components/chat/UserMessage.tsx
@@ -14,10 +14,10 @@ export const UserMessage = memo(function UserMessage({ content, attachments, bra
   const hasText = content.trim().length > 0
 
   return (
-    <div className="group mb-5 flex justify-end">
+    <div className="mb-5 flex justify-end">
       <div
         data-message-shell="user"
-        className="flex min-w-0 w-full max-w-[82%] flex-col items-end gap-2 sm:max-w-[78%] lg:max-w-[72%]"
+        className="group flex min-w-0 max-w-[82%] flex-col items-end gap-2 sm:max-w-[78%] lg:max-w-[72%]"
       >
         {attachments && attachments.length > 0 && (
           <AttachmentGallery attachments={attachments} variant="message" />