diff --git a/src/app.css b/src/app.css
index 27d2d7ef..9ff69e87 100644
--- a/src/app.css
+++ b/src/app.css
@@ -14,6 +14,14 @@ html {
 	word-break: break-word;
 }
 
+code {
+	white-space-collapse: preserve !important;
+	/* text-wrap: nowrap !important; */
+
+	white-space: nowrap;
+	width: auto;
+}
+
 math {
 	margin-top: 1rem;
 }
diff --git a/src/lib/components/chat/Messages.svelte b/src/lib/components/chat/Messages.svelte
index 5b7aca61..7e950d31 100644
--- a/src/lib/components/chat/Messages.svelte
+++ b/src/lib/components/chat/Messages.svelte
@@ -372,7 +372,7 @@
 						{/if}
 					</div>
 
-					<div class="w-full">
+					<div class="w-full overflow-hidden">
 						<div class=" self-center font-bold mb-0.5">
 							{#if message.role === 'user'}
 								You