diff --git a/frontend/src/components/markdown.tsx b/frontend/src/components/markdown.tsx
index 67058d6be..e08ca7fe2 100644
--- a/frontend/src/components/markdown.tsx
+++ b/frontend/src/components/markdown.tsx
@@ -374,7 +374,7 @@ export function Markdown(
 
   return (
     <div
-      className="markdown-body"
+      className="markdown-body overflow-x-auto max-w-full min-w-0"
       style={{
         fontSize: `${props.fontSize ?? 16}px`,
         fontFamily: props.fontFamily || "inherit"
diff --git a/frontend/src/routes/_auth.chat.$chatId.tsx b/frontend/src/routes/_auth.chat.$chatId.tsx
index 115363fc7..bcdddd11b 100644
--- a/frontend/src/routes/_auth.chat.$chatId.tsx
+++ b/frontend/src/routes/_auth.chat.$chatId.tsx
@@ -25,7 +25,7 @@ function UserMessage({ text, chatId }: { text: string; chatId: string }) {
         <div>
           <UserIcon />
         </div>
-        <div className="flex flex-col gap-2">
+        <div className="flex flex-col gap-2 min-w-0">
           <Markdown content={text} loading={false} chatId={chatId} />
         </div>
       </div>
@@ -60,7 +60,7 @@ function SystemMessage({
         <div>
           <AsteriskIcon />
         </div>
-        <div className="flex flex-col gap-2">
+        <div className="flex flex-col gap-2 min-w-0">
           <Markdown content={text} loading={loading} chatId={chatId} />
           <Button
             variant="ghost"