diff --git a/packages/kilo-ui/src/components/message-part.tsx b/packages/kilo-ui/src/components/message-part.tsx
index 232899c63e5..8e1e72648a0 100644
--- a/packages/kilo-ui/src/components/message-part.tsx
+++ b/packages/kilo-ui/src/components/message-part.tsx
@@ -2056,23 +2056,36 @@ function BashCopyButton(props: { value: () => string; label: string }) {
 function BashHighlightedOutput(props: { cmd: string; output: string; outputPath?: string; active?: boolean }) {
   const data = useData()
   const i18n = useI18n()
+  const cmdState = { signal: { aborted: false } }
+  const outState = { signal: { aborted: false } }
   let cmdRef: HTMLDivElement | undefined
   let outRef: HTMLDivElement | undefined
 
   createEffect(() => {
+    cmdState.signal.aborted = true
     if (!props.active) return
     const cmd = props.cmd
     if (!cmdRef || !cmd) return
+    const signal = { aborted: false }
+    cmdState.signal = signal
     cmdRef.innerHTML = `<pre data-slot="bash-pre"><code data-lang="shellscript">${escapeHtml(cmd)}</code></pre>`
-    void deferredHighlight(cmdRef)
+    void deferredHighlight(cmdRef, undefined, signal)
   })
 
   createEffect(() => {
+    outState.signal.aborted = true
     if (!props.active) return
     const out = props.output
     if (!outRef || !out) return
+    const signal = { aborted: false }
+    outState.signal = signal
     outRef.innerHTML = `<pre data-slot="bash-pre"><code data-lang="log">${escapeHtml(out)}</code></pre>`
-    void deferredHighlight(outRef)
+    void deferredHighlight(outRef, undefined, signal)
+  })
+
+  onCleanup(() => {
+    cmdState.signal.aborted = true
+    outState.signal.aborted = true
   })
 
   const openInEditor = () => {
diff --git a/packages/kilo-ui/src/components/shell-rolling-results.tsx b/packages/kilo-ui/src/components/shell-rolling-results.tsx
index 381e9230bfc..573e2e44bb0 100644
--- a/packages/kilo-ui/src/components/shell-rolling-results.tsx
+++ b/packages/kilo-ui/src/components/shell-rolling-results.tsx
@@ -60,14 +60,22 @@ function ShellRollingCommand(props: { text: string; animate?: boolean }) {
 }
 
 function ShellOutputHighlight(props: { code: string; active?: boolean }) {
+  const state = { signal: { aborted: false } }
   let ref: HTMLDivElement | undefined
 
   createEffect(() => {
+    state.signal.aborted = true
     if (!props.active) return
     const code = props.code
     if (!ref || !code) return
+    const signal = { aborted: false }
+    state.signal = signal
     ref.innerHTML = `<pre data-slot="shell-expanded-pre"><code data-lang="log">${escapeHtml(code)}</code></pre>`
-    void deferredHighlight(ref)
+    void deferredHighlight(ref, undefined, signal)
+  })
+
+  onCleanup(() => {
+    state.signal.aborted = true
   })
 
   return <div ref={ref} />