diff --git a/src/pages/Chat/ChatMessage.tsx b/src/pages/Chat/ChatMessage.tsx
index b0cf19982..8de44b0e2 100644
--- a/src/pages/Chat/ChatMessage.tsx
+++ b/src/pages/Chat/ChatMessage.tsx
@@ -84,7 +84,7 @@ export const ChatMessage = memo(function ChatMessage({
       {/* Content */}
       <div
         className={cn(
-          'flex flex-col w-full max-w-[80%] space-y-2',
+          'flex flex-col w-full min-w-0 max-w-[80%] space-y-2',
           isUser ? 'items-end' : 'items-start',
         )}
       >
@@ -346,7 +346,7 @@ function MessageBubble({
       )}
     >
       {isUser ? (
-        <p className="whitespace-pre-wrap text-sm">{text}</p>
+        <p className="whitespace-pre-wrap break-words text-sm">{text}</p>
       ) : (
         <div className="prose prose-sm dark:prose-invert max-w-none">
           <ReactMarkdown