diff --git a/src/tui/app.js b/src/tui/app.js
index e383466f..d3399aee 100644
--- a/src/tui/app.js
+++ b/src/tui/app.js
@@ -518,7 +518,6 @@ export default function App({
 				if (onSaveSession) {
 					onSaveSession();
 				}
-				messageListRef.current?.clear();
 				setStatusMessage("Something went wrong");
 				addMessage({
 					role: "system",
diff --git a/src/tui/messageBubble.js b/src/tui/messageBubble.js
index 63c484e7..198bfc83 100644
--- a/src/tui/messageBubble.js
+++ b/src/tui/messageBubble.js
@@ -260,7 +260,10 @@ export function MessageBubbleInner({
 							React.createElement(Spinner, { type: "dots2" }),
 							" thinking",
 						)
-					: React.createElement(MarkdownText, { content: text }),
+					: React.createElement(MarkdownText, {
+							content: text,
+							color: role === "system" ? "orange" : undefined,
+						}),
 			),
 			reasoningEl,
 			toolCallEl,