diff --git a/src/app/components/Content.svelte b/src/app/components/Content.svelte
index a7e3eae6..e7816b1f 100644
--- a/src/app/components/Content.svelte
+++ b/src/app/components/Content.svelte
@@ -96,7 +96,9 @@
         {:else if isTopic(parsed)}
           <ContentTopic value={parsed.value} />
         {:else if isCode(parsed)}
-          <ContentCode value={parsed.value} isBlock={isStartAndEnd(i)} />
+          <ContentCode
+            value={parsed.value}
+            isBlock={isStartAndEnd(i) || parsed.value.includes("\n")} />
         {:else if isCashu(parsed) || isInvoice(parsed)}
           <ContentToken value={parsed.value} />
         {:else if isLink(parsed)}
diff --git a/src/app/components/ContentCode.svelte b/src/app/components/ContentCode.svelte
index 0240f2c4..a35aa176 100644
--- a/src/app/components/ContentCode.svelte
+++ b/src/app/components/ContentCode.svelte
@@ -3,6 +3,8 @@
   export let isBlock
 </script>
 
-<code class="link-content w-full" class:block={isBlock}>
-  {value}
+<code
+  class="w-full overflow-auto whitespace-pre rounded bg-neutral p-2 text-neutral-content"
+  class:block={isBlock}>
+  {value.trim()}
 </code>