diff --git a/internal/ui/model/session.go b/internal/ui/model/session.go
index 5a86a88efb3b3d25da107fb43457422a6a62f7da..17172d87f9f7f46d63768512055604bce8adf262 100644
--- a/internal/ui/model/session.go
+++ b/internal/ui/model/session.go
@@ -213,7 +213,12 @@ func fileList(t *styles.Styles, cwd string, filesWithChanges []SessionFile, widt
 			filePath = rel
 		}
 		filePath = fsext.DirTrim(filePath, 2)
-		filePath = ansi.Truncate(filePath, width-(lipgloss.Width(extraContent)-2), "…")
+		suffix := ""
+		if extraContent != "" {
+			suffix = " " + extraContent
+		}
+		maxPathWidth := max(width-lipgloss.Width(suffix), 0)
+		filePath = ansi.Truncate(filePath, maxPathWidth, "…")
 
 		line := t.Files.Path.Render(filePath)
 		if extraContent != "" {