diff --git a/apps/code/src/renderer/features/message-editor/components/DiffStatsIndicator.tsx b/apps/code/src/renderer/features/message-editor/components/DiffStatsIndicator.tsx
index 580eb6864..00432bcfc 100644
--- a/apps/code/src/renderer/features/message-editor/components/DiffStatsIndicator.tsx
+++ b/apps/code/src/renderer/features/message-editor/components/DiffStatsIndicator.tsx
@@ -32,7 +32,7 @@ export function DiffStatsIndicator({
   }
 
   return (
-    <Flex align="center" gap="2">
+    <Flex align="center" gap="2" style={{ whiteSpace: "nowrap" }}>
       <Text
         size="1"
         style={{
diff --git a/apps/code/src/renderer/features/message-editor/components/MessageEditor.tsx b/apps/code/src/renderer/features/message-editor/components/MessageEditor.tsx
index d9d0daa9e..4e91c2f16 100644
--- a/apps/code/src/renderer/features/message-editor/components/MessageEditor.tsx
+++ b/apps/code/src/renderer/features/message-editor/components/MessageEditor.tsx
@@ -64,7 +64,12 @@ function ModeAndBranchRow({
   }
 
   return (
-    <Flex align="center" justify="between" style={{ overflow: "hidden" }}>
+    <Flex
+      align="center"
+      justify="between"
+      gap="3"
+      style={{ overflow: "hidden" }}
+    >
       <Flex align="center" gap="2" flexShrink="0">
         {isBashMode ? (
           <Text
@@ -89,7 +94,12 @@ function ModeAndBranchRow({
           </>
         )}
       </Flex>
-      <Flex align="center" gap="2" style={{ minWidth: 0, overflow: "hidden" }}>
+      <Flex
+        align="center"
+        gap="2"
+        wrap="nowrap"
+        style={{ minWidth: 0, overflow: "hidden" }}
+      >
         <DiffStatsIndicator
           repoPath={repoPath}
           overrideStats={cloudDiffStats}