diff --git a/packages/opencode/src/cli/cmd/tui/feature-plugins/system/diff-viewer.tsx b/packages/opencode/src/cli/cmd/tui/feature-plugins/system/diff-viewer.tsx
index b6dd872cee..8eb9d91955 100644
--- a/packages/opencode/src/cli/cmd/tui/feature-plugins/system/diff-viewer.tsx
+++ b/packages/opencode/src/cli/cmd/tui/feature-plugins/system/diff-viewer.tsx
@@ -127,7 +127,7 @@ function DiffViewer(props: { api: TuiPluginApi }) {
     const next =
       lastHighlighted !== undefined && fileRows().some((row) => row.id === lastHighlighted)
         ? lastHighlighted
-        : fileRows()[0]?.id
+        : fileRows().find((row) => row.fileIndex !== undefined)?.id
     setHighlightedFileNode(next)
   }