diff --git a/static/src/styles/components/chat/_chat-area.scss b/static/src/styles/components/chat/_chat-area.scss
index a4efcfe..7acb8ab 100644
--- a/static/src/styles/components/chat/_chat-area.scss
+++ b/static/src/styles/components/chat/_chat-area.scss
@@ -419,8 +419,8 @@
     box-shadow: 0 12px 28px rgba(61, 57, 41, 0.08);
     color: var(--claude-text);
     white-space: pre-wrap;
-    word-break: break-word;
-    overflow-wrap: anywhere;
+    word-break: break-all;
+    overflow-wrap: normal;
 }
 
 .user-message .message-text {
diff --git a/static/src/styles/components/input/_composer.scss b/static/src/styles/components/input/_composer.scss
index 0a3cc8d..9b07128 100644
--- a/static/src/styles/components/input/_composer.scss
+++ b/static/src/styles/components/input/_composer.scss
@@ -123,6 +123,9 @@
     line-height: 1.4;
     font-family: inherit;
     color: var(--claude-text);
+    white-space: pre-wrap;
+    word-break: break-all;
+    overflow-wrap: normal;
     padding: 0;
     min-height: 20px;
     outline: none;