diff --git a/src/renderer/src/assets/main.css b/src/renderer/src/assets/main.css
index 2d155f6fae8..df9c8e73397 100644
--- a/src/renderer/src/assets/main.css
+++ b/src/renderer/src/assets/main.css
@@ -1094,6 +1094,7 @@ html.native-shell .app-layout {
 .editor-header-text {
   min-width: 0;
   flex: 1;
+  overflow: hidden;
 }
 
 .editor-header-path {
@@ -1104,6 +1105,7 @@ html.native-shell .app-layout {
   padding: 0;
   max-width: 100%;
   width: 100%;
+  overflow: hidden;
   border: none;
   background: transparent;
   color: var(--muted-foreground);
@@ -1154,6 +1156,7 @@ html.native-shell .app-layout {
   align-items: center;
   gap: 8px;
   min-width: 0;
+  overflow: hidden;
 }
 
 .editor-header-copy-toast {
diff --git a/src/renderer/src/components/editor/DiffSectionHeader.tsx b/src/renderer/src/components/editor/DiffSectionHeader.tsx
index bc54d5261f2..145a29582f6 100644
--- a/src/renderer/src/components/editor/DiffSectionHeader.tsx
+++ b/src/renderer/src/components/editor/DiffSectionHeader.tsx
@@ -36,7 +36,7 @@ export function DiffSectionHeader({
         <span
           role="button"
           tabIndex={0}
-          className="inline-flex min-w-0 max-w-full cursor-copy hover:underline"
+          className="flex min-w-0 flex-1 cursor-copy overflow-hidden hover:underline"
           onMouseDown={(event) => {
             event.preventDefault()
             event.stopPropagation()
@@ -65,14 +65,16 @@ export function DiffSectionHeader({
           <span className="path-display-prefix">{displayPath.prefix}</span>
           <span className="path-display-file">{displayPath.fileName}</span>
         </span>
-        {dirty && <span className="font-medium ml-1">M</span>}
-        {(added > 0 || removed > 0) && (
-          <span className="tabular-nums ml-2">
-            {added > 0 && <span className="text-green-600 dark:text-green-500">+{added}</span>}
-            {added > 0 && removed > 0 && <span> </span>}
-            {removed > 0 && <span className="text-red-500">-{removed}</span>}
-          </span>
-        )}
+        <span className="flex shrink-0 items-center">
+          {dirty && <span className="font-medium ml-1">M</span>}
+          {(added > 0 || removed > 0) && (
+            <span className="tabular-nums ml-2">
+              {added > 0 && <span className="text-green-600 dark:text-green-500">+{added}</span>}
+              {added > 0 && removed > 0 && <span> </span>}
+              {removed > 0 && <span className="text-red-500">-{removed}</span>}
+            </span>
+          )}
+        </span>
       </span>
       <div className="flex items-center gap-1 shrink-0 ml-2">
         {trailingContent}