diff --git a/webui/src/components/FileReferenceChip.tsx b/webui/src/components/FileReferenceChip.tsx
index 5526fec7..6298c42a 100644
--- a/webui/src/components/FileReferenceChip.tsx
+++ b/webui/src/components/FileReferenceChip.tsx
@@ -87,7 +87,7 @@ export function FileReferenceChip({
               <span
                 data-sheen-text={active ? displayText : undefined}
                 className={cn(
-                  "min-w-0 max-w-full truncate",
+                  "min-w-0 max-w-full [overflow-wrap:anywhere] sm:truncate",
                   active && "streaming-text-sheen file-reference-sheen",
                   textClassName,
                 )}
diff --git a/webui/src/components/MarkdownTextRenderer.tsx b/webui/src/components/MarkdownTextRenderer.tsx
index 3d9c525f..8aa38a22 100644
--- a/webui/src/components/MarkdownTextRenderer.tsx
+++ b/webui/src/components/MarkdownTextRenderer.tsx
@@ -339,7 +339,7 @@ function InlineLinkPreviewRow({ link }: { link: InlineLinkPreview }) {
           <Globe2 className="h-3 w-3" />
         )}
       </span>
-      <span className="min-w-0 truncate leading-normal">
+      <span className="min-w-0 [overflow-wrap:anywhere] leading-normal sm:truncate">
         {label}
       </span>
     </a>
@@ -417,7 +417,7 @@ export default function MarkdownTextRenderer({
           return (
             <code
               className={cn(
-                "block min-w-0 whitespace-pre bg-transparent p-0 font-mono text-[0.8125rem]",
+                "block min-w-0 max-w-full overflow-x-auto whitespace-pre bg-transparent p-0 font-mono text-[0.8125rem]",
                 "leading-snug text-inherit",
                 cls,
               )}
@@ -497,6 +497,19 @@ export default function MarkdownTextRenderer({
           </a>
         );
       },
+      table({ children, ...props }) {
+        // Wrap wide markdown tables in a horizontal-scroll container (the
+        // pattern used by DeepSeek/others) so a 6+ column table scrolls inside
+        // the conversation column instead of forcing the page wider than 100vw.
+        // min-w-max keeps natural column widths; w-full stretches narrow tables.
+        return (
+          <div className="w-full overflow-x-auto">
+            <table className="w-full min-w-max" {...props}>
+              {children}
+            </table>
+          </div>
+        );
+      },
       li({ children: markdownChildren, className: itemClassName }) {
         const link = inlineLinkPreviewFromChildren(markdownChildren);
         if (link) {
diff --git a/webui/src/components/MessageBubble.tsx b/webui/src/components/MessageBubble.tsx
index 7cb9cf97..51e8fb0b 100644
--- a/webui/src/components/MessageBubble.tsx
+++ b/webui/src/components/MessageBubble.tsx
@@ -147,8 +147,8 @@ export function MessageBubble({
         {hasText ? (
           <p
             className={cn(
-              "ml-auto w-fit rounded-[18px] bg-secondary/70 px-4 py-2",
-              "text-left text-[16px]/[1.75] whitespace-pre-wrap break-words",
+              "ml-auto w-fit max-w-full min-w-0 rounded-[18px] bg-secondary/70 px-4 py-2",
+              "text-left text-[16px]/[1.75] whitespace-pre-wrap [overflow-wrap:anywhere]",
             )}
           >
             <CliAppMentionText
diff --git a/webui/src/globals.css b/webui/src/globals.css
index 6314f4e9..64edeae5 100644
--- a/webui/src/globals.css
+++ b/webui/src/globals.css
@@ -558,12 +558,10 @@
     overflow-x: auto;
   }
 
-  /* Wide markdown tables scroll horizontally within the conversation column. */
-  .markdown-content table {
-    display: block;
-    max-width: 100%;
-    overflow-x: auto;
-  }
+  /* Wide markdown tables scroll horizontally within the conversation column.
+     Tables are wrapped in an overflow-x:auto <div> by the markdown renderer's
+     custom `table` component (see MarkdownTextRenderer); min-w-max on the
+     <table> keeps natural column widths so it scrolls instead of shrinking. */
 
   /* Clip any residual horizontal bleed at the thread column edge. Vertical
      scrolling and internal code-block scroll are unaffected. */