diff --git a/src/lib/components/CodeBlock.svelte b/src/lib/components/CodeBlock.svelte
index 585050cf5be..db8513825d6 100644
--- a/src/lib/components/CodeBlock.svelte
+++ b/src/lib/components/CodeBlock.svelte
@@ -4,10 +4,10 @@
 
 	interface Props {
 		code?: string;
-		lang?: string;
+		rawCode?: string;
 	}
 
-	let { code = "" }: Props = $props();
+	let { code = "", rawCode = "" }: Props = $props();
 </script>
 
 <div class="group relative my-4 rounded-lg">
@@ -17,6 +17,6 @@
 		></pre>
 	<CopyToClipBoardBtn
 		classNames="btn rounded-lg border border-gray-200 px-2 py-2 text-sm shadow-sm transition-all hover:border-gray-300 active:shadow-inner dark:border-gray-700 dark:hover:border-gray-500 absolute top-2 right-2 invisible opacity-0 group-hover:visible group-hover:opacity-100 dark:text-gray-700 text-gray-200"
-		value={code}
+		value={rawCode}
 	/>
 </div>
diff --git a/src/lib/components/chat/ChatWindow.svelte b/src/lib/components/chat/ChatWindow.svelte
index 55c388c7d2e..b56bc2d2a2b 100644
--- a/src/lib/components/chat/ChatWindow.svelte
+++ b/src/lib/components/chat/ChatWindow.svelte
@@ -276,8 +276,8 @@
 			{/if}
 
 			{#if messages.length > 0}
-				<div class="flex h-max flex-col-reverse gap-8 pb-52">
-					{#each messages.toReversed() as message, idx (message.id)}
+				<div class="flex h-max flex-col gap-8 pb-52">
+					{#each messages as message, idx (message.id)}
 						<ChatMessage
 							{loading}
 							{message}
diff --git a/src/lib/components/chat/MarkdownRenderer.svelte b/src/lib/components/chat/MarkdownRenderer.svelte
index 2f5c67d646e..d40e9361bb0 100644
--- a/src/lib/components/chat/MarkdownRenderer.svelte
+++ b/src/lib/components/chat/MarkdownRenderer.svelte
@@ -62,6 +62,6 @@
 			{@html DOMPurify.sanitize(html)}
 		{/await}
 	{:else if token.type === "code"}
-		<CodeBlock code={token.code} />
+		<CodeBlock code={token.code} rawCode={token.rawCode} />
 	{/if}
 {/each}
diff --git a/src/lib/utils/marked.ts b/src/lib/utils/marked.ts
index ee1c47290d2..84fa7bc5081 100644
--- a/src/lib/utils/marked.ts
+++ b/src/lib/utils/marked.ts
@@ -172,6 +172,7 @@ type CodeToken = {
 	type: "code";
 	lang: string;
 	code: string;
+	rawCode: string;
 };
 
 type TextToken = {
@@ -190,6 +191,7 @@ export async function processTokens(content: string, sources: WebSearchSource[])
 					type: "code" as const,
 					lang: token.lang,
 					code: hljs.highlightAuto(token.text, hljs.getLanguage(token.lang)?.aliases).value,
+					rawCode: token.text,
 				};
 			} else {
 				return {
@@ -212,6 +214,7 @@ export function processTokensSync(content: string, sources: WebSearchSource[]):
 				type: "code" as const,
 				lang: token.lang,
 				code: hljs.highlightAuto(token.text, hljs.getLanguage(token.lang)?.aliases).value,
+				rawCode: token.text,
 			};
 		}
 		return { type: "text" as const, html: marked.parse(token.raw) };