diff --git a/packages/ui/src/components/views/DiffView.tsx b/packages/ui/src/components/views/DiffView.tsx
index 07e457e1..aea87eb8 100644
--- a/packages/ui/src/components/views/DiffView.tsx
+++ b/packages/ui/src/components/views/DiffView.tsx
@@ -368,12 +368,12 @@ export const DiffView: React.FC = () => {
         }
     }, [pendingDiffFile, setPendingDiffFile]);
 
-    // Auto-select first file
+    // Auto-select first file (skip if we have a pending file to consume)
     React.useEffect(() => {
-        if (!selectedFile && changedFiles.length > 0) {
+        if (!selectedFile && !pendingDiffFile && changedFiles.length > 0) {
             setSelectedFile(changedFiles[0].path);
         }
-    }, [changedFiles, selectedFile]);
+    }, [changedFiles, selectedFile, pendingDiffFile]);
 
     // Clear selection if file no longer exists
     React.useEffect(() => {