diff --git a/.changeset/fluffy-apples-attack.md b/.changeset/fluffy-apples-attack.md
new file mode 100644
index 0000000000..924a1b2505
--- /dev/null
+++ b/.changeset/fluffy-apples-attack.md
@@ -0,0 +1,5 @@
+---
+"roo-cline": patch
+---
+
+Handle really long text in the ChatRow similar to TaskHeader
diff --git a/webview-ui/src/components/chat/ChatRow.tsx b/webview-ui/src/components/chat/ChatRow.tsx
index b139c68f96..4017ccf318 100644
--- a/webview-ui/src/components/chat/ChatRow.tsx
+++ b/webview-ui/src/components/chat/ChatRow.tsx
@@ -617,8 +617,10 @@ export const ChatRowContent = ({
 								color: "var(--vscode-badge-foreground)",
 								borderRadius: "3px",
 								padding: "9px",
-								whiteSpace: "pre-line",
-								wordWrap: "break-word",
+								overflow: "hidden",
+								whiteSpace: "pre-wrap",
+								wordBreak: "break-word",
+								overflowWrap: "anywhere",
 							}}>
 							<div
 								style={{