diff --git a/packages/cli/src/ui/components/DetailedMessagesDisplay.test.tsx b/packages/cli/src/ui/components/DetailedMessagesDisplay.test.tsx
index 203b2364c7..e605d71095 100644
--- a/packages/cli/src/ui/components/DetailedMessagesDisplay.test.tsx
+++ b/packages/cli/src/ui/components/DetailedMessagesDisplay.test.tsx
@@ -58,17 +58,7 @@ describe('DetailedMessagesDisplay', () => {
     );
     const output = lastFrame();
 
-    expect(output).toContain('Debug Console');
-    expect(output).toContain('Log message');
-    expect(output).toContain('Warning message');
-    expect(output).toContain('Error message');
-    expect(output).toContain('Debug message');
-
-    // Check for icons
-    expect(output).toContain('ℹ');
-    expect(output).toContain('⚠');
-    expect(output).toContain('✖');
-    expect(output).toContain('🔍');
+    expect(output).toMatchSnapshot();
   });
 
   it('renders message counts', () => {
@@ -86,7 +76,6 @@ describe('DetailedMessagesDisplay', () => {
     );
     const output = lastFrame();
 
-    expect(output).toContain('Repeated message');
-    expect(output).toContain('(x5)');
+    expect(output).toMatchSnapshot();
   });
 });
diff --git a/packages/cli/src/ui/components/DetailedMessagesDisplay.tsx b/packages/cli/src/ui/components/DetailedMessagesDisplay.tsx
index a8c332ac35..ff88afa888 100644
--- a/packages/cli/src/ui/components/DetailedMessagesDisplay.tsx
+++ b/packages/cli/src/ui/components/DetailedMessagesDisplay.tsx
@@ -21,6 +21,8 @@ interface DetailedMessagesDisplayProps {
   hasFocus: boolean;
 }
 
+const iconBoxWidth = 3;
+
 export const DetailedMessagesDisplay: React.FC<
   DetailedMessagesDisplayProps
 > = ({ messages, maxHeight, width, hasFocus }) => {
@@ -34,8 +36,7 @@ export const DetailedMessagesDisplay: React.FC<
       if (!msg) {
         return 1;
       }
-      const iconAndSpace = 2;
-      const textWidth = width - borderAndPadding - iconAndSpace;
+      const textWidth = width - borderAndPadding - iconBoxWidth;
       if (textWidth <= 0) {
         return 1;
       }
@@ -96,7 +97,9 @@ export const DetailedMessagesDisplay: React.FC<
 
             return (
               <Box flexDirection="row">
-                <Text color={textColor}>{icon} </Text>
+                <Box minWidth={iconBoxWidth} flexShrink={0}>
+                  <Text color={textColor}>{icon}</Text>
+                </Box>
                 <Text color={textColor} wrap="wrap">
                   {msg.content}
                   {msg.count && msg.count > 1 && (
diff --git a/packages/cli/src/ui/components/__snapshots__/DetailedMessagesDisplay.test.tsx.snap b/packages/cli/src/ui/components/__snapshots__/DetailedMessagesDisplay.test.tsx.snap
new file mode 100644
index 0000000000..85dcfa0ad8
--- /dev/null
+++ b/packages/cli/src/ui/components/__snapshots__/DetailedMessagesDisplay.test.tsx.snap
@@ -0,0 +1,39 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`DetailedMessagesDisplay > renders message counts 1`] = `
+"
+╭──────────────────────────────────────────────────────────────────────────────╮
+│ Debug Console (F12 to close)                                                 │
+│                                                                              │
+│ ℹ  Repeated message (x5)                                                     │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+╰──────────────────────────────────────────────────────────────────────────────╯"
+`;
+
+exports[`DetailedMessagesDisplay > renders messages correctly 1`] = `
+"
+╭──────────────────────────────────────────────────────────────────────────────╮
+│ Debug Console (F12 to close)                                                 │
+│                                                                              │
+│ ℹ  Log message                                                               │
+│ ⚠  Warning message                                                           │
+│ ✖  Error message                                                             │
+│ 🔍 Debug message                                                             │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+╰──────────────────────────────────────────────────────────────────────────────╯"
+`;