diff --git a/packages/ui/src/features/code-review/commentFileFilter.ts b/packages/ui/src/features/code-review/commentFileFilter.ts
new file mode 100644
index 0000000000..4ea3a8f0a5
--- /dev/null
+++ b/packages/ui/src/features/code-review/commentFileFilter.ts
@@ -0,0 +1,123 @@
+import type { PrCommentThread } from "@posthog/core/code-review/types";
+import type { ReactNode } from "react";
+
+export type CommentFileFilter = "none" | "commented" | "unresolved";
+
+export interface ReviewListItem {
+  key: string;
+  scrollKey?: string;
+  filePaths?: string[];
+  node: ReactNode;
+}
+
+interface CommentFileFilterState {
+  activeFilter: CommentFileFilter;
+  visibleItems: ReviewListItem[];
+  commentedFileCount: number;
+  unresolvedCommentedFileCount: number;
+}
+
+interface DeriveCommentFileFilterStateArgs {
+  items: ReviewListItem[];
+  requestedFilter: CommentFileFilter;
+  commentedFilePaths?: ReadonlySet<string>;
+  unresolvedCommentedFilePaths?: ReadonlySet<string>;
+}
+
+export function getCommentedFilePaths(threads: Map<number, PrCommentThread>): {
+  all: Set<string>;
+  unresolved: Set<string>;
+} {
+  const all = new Set<string>();
+  const unresolved = new Set<string>();
+
+  for (const thread of threads.values()) {
+    if (thread.comments.length === 0) continue;
+    all.add(thread.filePath);
+    if (!thread.isResolved) unresolved.add(thread.filePath);
+  }
+
+  return { all, unresolved };
+}
+
+export function filterReviewItemsByFilePaths(
+  items: ReviewListItem[],
+  filePaths: ReadonlySet<string>,
+): ReviewListItem[] {
+  const filteredItems: ReviewListItem[] = [];
+  let pendingSectionItems: ReviewListItem[] = [];
+
+  for (const item of items) {
+    if (!item.filePaths) {
+      pendingSectionItems = [item];
+      continue;
+    }
+
+    if (!item.filePaths.some((filePath) => filePaths.has(filePath))) continue;
+
+    filteredItems.push(...pendingSectionItems, item);
+    pendingSectionItems = [];
+  }
+
+  return filteredItems;
+}
+
+export function deriveCommentFileFilterState({
+  items,
+  requestedFilter,
+  commentedFilePaths,
+  unresolvedCommentedFilePaths,
+}: DeriveCommentFileFilterStateArgs): CommentFileFilterState {
+  if (!commentedFilePaths || !unresolvedCommentedFilePaths) {
+    return {
+      activeFilter: "none",
+      visibleItems: items,
+      commentedFileCount: 0,
+      unresolvedCommentedFileCount: 0,
+    };
+  }
+
+  const commentedItems = filterReviewItemsByFilePaths(
+    items,
+    commentedFilePaths,
+  );
+  const unresolvedCommentedItems = filterReviewItemsByFilePaths(
+    items,
+    unresolvedCommentedFilePaths,
+  );
+
+  let visibleItems: ReviewListItem[];
+  switch (requestedFilter) {
+    case "commented":
+      visibleItems = commentedItems;
+      break;
+    case "unresolved":
+      visibleItems = unresolvedCommentedItems;
+      break;
+    case "none":
+      visibleItems = items;
+      break;
+  }
+
+  return {
+    activeFilter: requestedFilter,
+    visibleItems,
+    commentedFileCount: commentedItems.filter((item) => item.filePaths).length,
+    unresolvedCommentedFileCount: unresolvedCommentedItems.filter(
+      (item) => item.filePaths,
+    ).length,
+  };
+}
+
+export function getEmptyReviewMessage(
+  commentFilter: CommentFileFilter,
+): string {
+  switch (commentFilter) {
+    case "commented":
+      return "No files with comments";
+    case "unresolved":
+      return "No files with unresolved comments";
+    case "none":
+      return "No file changes to review";
+  }
+}
diff --git a/packages/ui/src/features/code-review/components/CloudReviewPage.tsx b/packages/ui/src/features/code-review/components/CloudReviewPage.tsx
index fc45568bd8..db6e01f571 100644
--- a/packages/ui/src/features/code-review/components/CloudReviewPage.tsx
+++ b/packages/ui/src/features/code-review/components/CloudReviewPage.tsx
@@ -7,14 +7,13 @@ import { useMemo } from "react";
 import { useDiffViewerStore } from "../../code-editor/diffViewerStore";
 import { usePrDetails } from "../../git-interaction/usePrDetails";
 import { useCloudChangedFiles } from "../../task-detail/hooks/useCloudChangedFiles";
-import { useReviewNavigationStore } from "../reviewNavigationStore";
-import { PatchedFileDiff } from "./PatchedFileDiff";
 import {
-  buildItemIndex,
+  getCommentedFilePaths,
   type ReviewListItem,
-  ReviewShell,
-  useReviewState,
-} from "./ReviewShell";
+} from "../commentFileFilter";
+import { useReviewNavigationStore } from "../reviewNavigationStore";
+import { PatchedFileDiff } from "./PatchedFileDiff";
+import { ReviewShell, useReviewState } from "./ReviewShell";
 import { changedFileSignature } from "./reviewItemBuilders";
 
 interface CloudReviewPageProps {
@@ -36,9 +35,16 @@ export function CloudReviewPage({ task }: CloudReviewPageProps) {
     toolCalls,
     isLoading,
   } = useCloudChangedFiles(taskId, task, isReviewOpen);
-  const { commentThreads } = usePrDetails(prUrl, {
+  const { commentThreads, commentsLoading } = usePrDetails(prUrl, {
     includeComments: isReviewOpen && showReviewComments,
   });
+  const commentedFilePaths = useMemo(
+    () =>
+      prUrl && !commentsLoading
+        ? getCommentedFilePaths(commentThreads)
+        : undefined,
+    [commentThreads, commentsLoading, prUrl],
+  );
 
   const allPaths = useMemo(() => reviewFiles.map((f) => f.path), [reviewFiles]);
 
@@ -83,6 +89,9 @@ export function CloudReviewPage({ task }: CloudReviewPageProps) {
       return {
         key: file.path,
         scrollKey: file.path,
+        filePaths: [file.path, file.originalPath].filter(
+          (path): path is string => !!path,
+        ),
         node: (
           <PatchedFileDiff
             file={file}
@@ -111,8 +120,6 @@ export function CloudReviewPage({ task }: CloudReviewPageProps) {
     toolCallFallbacks,
   ]);
 
-  const itemIndexByFilePath = useMemo(() => buildItemIndex(items), [items]);
-
   if (!prUrl && !effectiveBranch && reviewFiles.length === 0) {
     if (isRunActive) {
       return (
@@ -146,7 +153,8 @@ export function CloudReviewPage({ task }: CloudReviewPageProps) {
       onUncollapseFile={uncollapseFile}
       onCollapseFiles={collapseFiles}
       items={items}
-      itemIndexByFilePath={itemIndexByFilePath}
+      commentedFilePaths={commentedFilePaths?.all}
+      unresolvedCommentedFilePaths={commentedFilePaths?.unresolved}
       currentSignatures={currentSignatures}
       viewedRecord={viewedRecord}
       onToggleViewed={toggleViewed}
diff --git a/packages/ui/src/features/code-review/components/CommentFilterSubmenu.tsx b/packages/ui/src/features/code-review/components/CommentFilterSubmenu.tsx
new file mode 100644
index 0000000000..3e64cad8cd
--- /dev/null
+++ b/packages/ui/src/features/code-review/components/CommentFilterSubmenu.tsx
@@ -0,0 +1,66 @@
+import {
+  DropdownMenuItem,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuSeparator,
+  DropdownMenuSub,
+  DropdownMenuSubContent,
+  DropdownMenuSubTrigger,
+} from "@posthog/quill";
+import type { CommentFileFilter } from "../commentFileFilter";
+
+interface CommentFilterSubmenuProps {
+  commentedFileCount: number;
+  unresolvedCommentedFileCount: number;
+  commentFilter: CommentFileFilter;
+  onCommentFilterChange: (filter: CommentFileFilter) => void;
+}
+
+function getCommentFilterSuffix(commentFilter: CommentFileFilter): string {
+  switch (commentFilter) {
+    case "commented":
+      return " · All";
+    case "unresolved":
+      return " · Unresolved";
+    case "none":
+      return "";
+  }
+}
+
+export function CommentFilterSubmenu({
+  commentedFileCount,
+  unresolvedCommentedFileCount,
+  commentFilter,
+  onCommentFilterChange,
+}: CommentFilterSubmenuProps) {
+  return (
+    <DropdownMenuSub>
+      <DropdownMenuSubTrigger>
+        Comment filter{getCommentFilterSuffix(commentFilter)}
+      </DropdownMenuSubTrigger>
+      <DropdownMenuSubContent side="right" sideOffset={4}>
+        <DropdownMenuRadioGroup
+          value={commentFilter === "none" ? "" : commentFilter}
+          onValueChange={(value) =>
+            onCommentFilterChange(value as CommentFileFilter)
+          }
+        >
+          <DropdownMenuRadioItem value="commented">
+            All comments ({commentedFileCount})
+          </DropdownMenuRadioItem>
+          <DropdownMenuRadioItem value="unresolved">
+            Unresolved comments ({unresolvedCommentedFileCount})
+          </DropdownMenuRadioItem>
+        </DropdownMenuRadioGroup>
+        {commentFilter !== "none" && (
+          <>
+            <DropdownMenuSeparator />
+            <DropdownMenuItem onClick={() => onCommentFilterChange("none")}>
+              Clear comment filter
+            </DropdownMenuItem>
+          </>
+        )}
+      </DropdownMenuSubContent>
+    </DropdownMenuSub>
+  );
+}
diff --git a/packages/ui/src/features/code-review/components/DiffSettingsMenu.tsx b/packages/ui/src/features/code-review/components/DiffSettingsMenu.tsx
index 3fca6ae674..d4eb4f2590 100644
--- a/packages/ui/src/features/code-review/components/DiffSettingsMenu.tsx
+++ b/packages/ui/src/features/code-review/components/DiffSettingsMenu.tsx
@@ -8,8 +8,22 @@ import {
   DropdownMenuTrigger,
 } from "@posthog/quill";
 import { useDiffViewerStore } from "@posthog/ui/features/code-editor/diffViewerStore";
+import type { CommentFileFilter } from "../commentFileFilter";
+import { CommentFilterSubmenu } from "./CommentFilterSubmenu";
 
-export function DiffSettingsMenu() {
+interface DiffSettingsMenuProps {
+  commentedFileCount: number;
+  unresolvedCommentedFileCount: number;
+  commentFilter: CommentFileFilter;
+  onCommentFilterChange?: (filter: CommentFileFilter) => void;
+}
+
+export function DiffSettingsMenu({
+  commentedFileCount,
+  unresolvedCommentedFileCount,
+  commentFilter,
+  onCommentFilterChange,
+}: DiffSettingsMenuProps) {
   const wordWrap = useDiffViewerStore((s) => s.wordWrap);
   const toggleWordWrap = useDiffViewerStore((s) => s.toggleWordWrap);
   const wordDiffs = useDiffViewerStore((s) => s.wordDiffs);
@@ -24,6 +38,12 @@ export function DiffSettingsMenu() {
   const toggleShowReviewComments = useDiffViewerStore(
     (s) => s.toggleShowReviewComments,
   );
+  const handleToggleReviewComments = () => {
+    if (showReviewComments && commentFilter !== "none") {
+      onCommentFilterChange?.("none");
+    }
+    toggleShowReviewComments();
+  };
 
   return (
     <DropdownMenu>
@@ -31,7 +51,12 @@ export function DiffSettingsMenu() {
         render={
           <Button
             size="icon-sm"
-            aria-label="Diff settings"
+            variant={commentFilter === "none" ? "default" : "primary"}
+            aria-label={
+              commentFilter === "none"
+                ? "Diff settings"
+                : `Diff settings, ${commentFilter} comment filter active`
+            }
             className="rounded-xs"
           >
             <DotsThree size={16} weight="bold" />
@@ -54,9 +79,17 @@ export function DiffSettingsMenu() {
           {hideWhitespaceChanges ? "Show whitespace" : "Hide whitespace"}
         </DropdownMenuItem>
         <DropdownMenuSeparator />
-        <DropdownMenuItem onClick={toggleShowReviewComments}>
+        <DropdownMenuItem onClick={handleToggleReviewComments}>
           {showReviewComments ? "Hide review comments" : "Show review comments"}
         </DropdownMenuItem>
+        {showReviewComments && onCommentFilterChange && (
+          <CommentFilterSubmenu
+            commentedFileCount={commentedFileCount}
+            unresolvedCommentedFileCount={unresolvedCommentedFileCount}
+            commentFilter={commentFilter}
+            onCommentFilterChange={onCommentFilterChange}
+          />
+        )}
       </DropdownMenuContent>
     </DropdownMenu>
   );
diff --git a/packages/ui/src/features/code-review/components/ReviewPage.tsx b/packages/ui/src/features/code-review/components/ReviewPage.tsx
index d42685815c..4954d2ccb4 100644
--- a/packages/ui/src/features/code-review/components/ReviewPage.tsx
+++ b/packages/ui/src/features/code-review/components/ReviewPage.tsx
@@ -18,17 +18,16 @@ import { useCwd } from "../../sidebar/useCwd";
 import { useDiscardAllChanges } from "../../task-detail/hooks/useDiscardAllChanges";
 import { useDiscardFile } from "../../task-detail/hooks/useDiscardFile";
 import { useStageToggle } from "../../task-detail/hooks/useStageToggle";
+import {
+  getCommentedFilePaths,
+  type ReviewListItem,
+} from "../commentFileFilter";
 import { REVIEW_FILE_CACHE_TIME_MS, REVIEW_MAX_FILE_LINES } from "../constants";
 import { useEffectiveDiffSource } from "../hooks/useEffectiveDiffSource";
 import { useReviewDiffs } from "../hooks/useReviewDiffs";
 import { useReviewNavigationStore } from "../reviewNavigationStore";
 import type { DiffOptions } from "../types";
-import {
-  buildItemIndex,
-  type ReviewListItem,
-  ReviewShell,
-  useReviewState,
-} from "./ReviewShell";
+import { ReviewShell, useReviewState } from "./ReviewShell";
 import {
   buildPatchReviewItems,
   buildRemoteReviewItems,
@@ -109,12 +108,19 @@ export function ReviewPage({ task }: ReviewPageProps) {
   } = useEffectiveDiffSource(taskId);
 
   const showReviewComments = useDiffViewerStore((s) => s.showReviewComments);
-  const { commentThreads } = usePrDetails(prUrl, {
+  const { commentThreads, commentsLoading } = usePrDetails(prUrl, {
     includeComments: isReviewOpen && showReviewComments,
   });
   const effectiveCommentThreads = showReviewComments
     ? commentThreads
     : undefined;
+  const commentedFilePaths = useMemo(
+    () =>
+      prUrl && !commentsLoading
+        ? getCommentedFilePaths(commentThreads)
+        : undefined,
+    [commentThreads, commentsLoading, prUrl],
+  );
 
   const isLocalActive = isReviewOpen && effectiveSource === "local";
 
@@ -173,6 +179,8 @@ export function ReviewPage({ task }: ReviewPageProps) {
         branchSourceAvailable={branchSourceAvailable}
         prSourceAvailable={prSourceAvailable}
         commentThreads={effectiveCommentThreads}
+        commentedFilePaths={commentedFilePaths?.all}
+        unresolvedCommentedFilePaths={commentedFilePaths?.unresolved}
       />
     );
   }
@@ -206,6 +214,8 @@ export function ReviewPage({ task }: ReviewPageProps) {
       untrackedFiles={untrackedFiles}
       stagedPathSet={stagedPathSet}
       commentThreads={effectiveCommentThreads}
+      commentedFilePaths={commentedFilePaths?.all}
+      unresolvedCommentedFilePaths={commentedFilePaths?.unresolved}
       effectiveSource={effectiveSource}
       branchSourceAvailable={branchSourceAvailable}
       prSourceAvailable={prSourceAvailable}
@@ -242,6 +252,8 @@ function LocalReviewContent({
   untrackedFiles,
   stagedPathSet,
   commentThreads,
+  commentedFilePaths,
+  unresolvedCommentedFilePaths,
   effectiveSource,
   branchSourceAvailable,
   prSourceAvailable,
@@ -274,6 +286,8 @@ function LocalReviewContent({
   untrackedFiles: ChangedFile[];
   stagedPathSet: Set<string>;
   commentThreads?: Map<number, PrCommentThread>;
+  commentedFilePaths?: ReadonlySet<string>;
+  unresolvedCommentedFilePaths?: ReadonlySet<string>;
   effectiveSource: ResolvedDiffSource;
   branchSourceAvailable: boolean;
   prSourceAvailable: boolean;
@@ -414,8 +428,6 @@ function LocalReviewContent({
     unstagedParsedFiles,
   ]);
 
-  const itemIndexByFilePath = useMemo(() => buildItemIndex(items), [items]);
-
   return (
     <ReviewShell
       task={task}
@@ -436,7 +448,8 @@ function LocalReviewContent({
       prSourceAvailable={prSourceAvailable}
       defaultBranch={defaultBranch}
       items={items}
-      itemIndexByFilePath={itemIndexByFilePath}
+      commentedFilePaths={commentedFilePaths}
+      unresolvedCommentedFilePaths={unresolvedCommentedFilePaths}
       currentSignatures={currentSignatures}
       viewedRecord={viewedRecord}
       onToggleViewed={toggleViewed}
@@ -455,6 +468,8 @@ function RemoteReviewPage({
   branchSourceAvailable,
   prSourceAvailable,
   commentThreads,
+  commentedFilePaths,
+  unresolvedCommentedFilePaths,
 }: {
   task: Task;
   repoPath: string | null;
@@ -466,6 +481,8 @@ function RemoteReviewPage({
   branchSourceAvailable: boolean;
   prSourceAvailable: boolean;
   commentThreads?: Map<number, PrCommentThread>;
+  commentedFilePaths?: ReadonlySet<string>;
+  unresolvedCommentedFilePaths?: ReadonlySet<string>;
 }) {
   const taskId = task.id;
   const isBranch = effectiveSource === "branch";
@@ -526,8 +543,6 @@ function RemoteReviewPage({
       taskId,
     ],
   );
-  const itemIndexByFilePath = useMemo(() => buildItemIndex(items), [items]);
-
   return (
     <ReviewShell
       task={task}
@@ -547,7 +562,8 @@ function RemoteReviewPage({
       prSourceAvailable={prSourceAvailable}
       defaultBranch={defaultBranch}
       items={items}
-      itemIndexByFilePath={itemIndexByFilePath}
+      commentedFilePaths={commentedFilePaths}
+      unresolvedCommentedFilePaths={unresolvedCommentedFilePaths}
       currentSignatures={currentSignatures}
       viewedRecord={reviewState.viewedRecord}
       onToggleViewed={reviewState.toggleViewed}
diff --git a/packages/ui/src/features/code-review/components/ReviewShell.tsx b/packages/ui/src/features/code-review/components/ReviewShell.tsx
index 3e03271bfc..b5eb016370 100644
--- a/packages/ui/src/features/code-review/components/ReviewShell.tsx
+++ b/packages/ui/src/features/code-review/components/ReviewShell.tsx
@@ -5,8 +5,20 @@ import { useArchivedTaskIds } from "@posthog/ui/features/archive/useArchivedTask
 import { useCloudPrUrl } from "@posthog/ui/features/git-interaction/useCloudPrUrl";
 import { useTaskPrStatus } from "@posthog/ui/features/sidebar/useTaskPrStatus";
 import { Flex, Spinner, Text } from "@radix-ui/themes";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import {
+  type ReactNode,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
 import { VList, type VListHandle } from "virtua";
+import {
+  deriveCommentFileFilterState,
+  getEmptyReviewMessage,
+  type ReviewListItem,
+} from "../commentFileFilter";
 import {
   REVIEW_LIST_BUFFER_PX,
   REVIEW_LIST_ESTIMATED_ITEM_SIZE,
@@ -14,8 +26,9 @@ import {
 import { useReviewDraftsStore } from "../reviewDraftsStore";
 import { REVIEW_HOST, type ReviewHost } from "../reviewHost";
 import { useReviewNavigationStore } from "../reviewNavigationStore";
-import type { ReviewListItem, ReviewShellProps } from "../reviewShellParts";
+import type { ReviewShellProps } from "../reviewShellParts";
 import {
+  buildItemIndex,
   findActiveScrollKey,
   findRenderedScrollAnchor,
   isFileViewed,
@@ -112,7 +125,8 @@ export function ReviewShell({
   isLoading,
   isEmpty,
   items,
-  itemIndexByFilePath,
+  commentedFilePaths,
+  unresolvedCommentedFilePaths,
   currentSignatures,
   viewedRecord,
   onToggleViewed,
@@ -135,6 +149,31 @@ export function ReviewShell({
   const lastActiveRef = useRef<string | null>(null);
   const pendingNavigationRef = useRef<string | null>(null);
   const navigationFrameRef = useRef<number | null>(null);
+  const commentFilter = useReviewNavigationStore(
+    (state) => state.commentFileFilters[taskId] ?? "none",
+  );
+  const setCommentFileFilter = useReviewNavigationStore(
+    (state) => state.setCommentFileFilter,
+  );
+  const {
+    activeFilter: activeCommentFilter,
+    visibleItems,
+    commentedFileCount,
+    unresolvedCommentedFileCount,
+  } = useMemo(
+    () =>
+      deriveCommentFileFilterState({
+        items,
+        requestedFilter: commentFilter,
+        commentedFilePaths,
+        unresolvedCommentedFilePaths,
+      }),
+    [commentFilter, commentedFilePaths, items, unresolvedCommentedFilePaths],
+  );
+  const visibleItemIndexByFilePath = useMemo(
+    () => buildItemIndex(visibleItems),
+    [visibleItems],
+  );
 
   const workerFactory = useCallback(
     () => reviewHost.diffWorkerFactory(),
@@ -147,12 +186,21 @@ export function ReviewShell({
   const isExpanded = reviewMode === "expanded";
 
   const viewedCount = useMemo(() => {
+    const visibleKeys =
+      activeCommentFilter !== "none"
+        ? new Set(
+            visibleItems.flatMap((item) =>
+              item.scrollKey ? [item.scrollKey] : [],
+            ),
+          )
+        : null;
     let count = 0;
     for (const [key, sig] of currentSignatures) {
+      if (visibleKeys && !visibleKeys.has(key)) continue;
       if (isFileViewed(viewedRecord[key], sig)) count++;
     }
     return count;
-  }, [currentSignatures, viewedRecord]);
+  }, [activeCommentFilter, currentSignatures, viewedRecord, visibleItems]);
 
   // Collapse already-viewed files on first open per task (mirrors GitHub).
   // Skips on re-opens: seededTaskRef prevents re-collapsing files the user
@@ -219,7 +267,7 @@ export function ReviewShell({
 
   useEffect(() => {
     if (!scrollRequest) return;
-    const targetIndex = itemIndexByFilePath.get(scrollRequest);
+    const targetIndex = visibleItemIndexByFilePath.get(scrollRequest);
     if (targetIndex === undefined) return;
 
     const currentSignature = currentSignatures.get(scrollRequest);
@@ -260,11 +308,11 @@ export function ReviewShell({
   }, [
     clearScrollRequest,
     currentSignatures,
-    itemIndexByFilePath,
     onUncollapseFile,
     scrollRequest,
     setActiveFilePath,
     taskId,
+    visibleItemIndexByFilePath,
     viewedRecord,
   ]);
 
@@ -293,6 +341,38 @@ export function ReviewShell({
     [],
   );
 
+  let reviewContent: ReactNode;
+  if (isLoading) {
+    reviewContent = (
+      <Flex align="center" justify="center" className="min-h-0 flex-1">
+        <Spinner size="2" />
+      </Flex>
+    );
+  } else if (isEmpty || visibleItems.length === 0) {
+    reviewContent = (
+      <Flex align="center" justify="center" className="min-h-0 flex-1">
+        <Text color="gray" className="text-sm">
+          {getEmptyReviewMessage(activeCommentFilter)}
+        </Text>
+      </Flex>
+    );
+  } else {
+    reviewContent = (
+      <VList
+        ref={listRef}
+        bufferSize={REVIEW_LIST_BUFFER_PX}
+        itemSize={REVIEW_LIST_ESTIMATED_ITEM_SIZE}
+        className="pierre-scroll-root scrollbar-overlay-y min-h-0 flex-1 overflow-auto bg-(--gray-2)"
+        shift={false}
+        style={{ scrollbarGutter: "stable" }}
+        onScroll={handleScroll}
+        data={visibleItems}
+      >
+        {renderItem}
+      </VList>
+    );
+  }
+
   return (
     <WorkerPoolContextProvider
       // poolSize: each highlighter worker is a full V8 isolate with shiki
@@ -325,6 +405,14 @@ export function ReviewShell({
             taskId={taskId}
             fileCount={fileCount}
             viewedCount={viewedCount}
+            commentedFileCount={commentedFileCount}
+            unresolvedCommentedFileCount={unresolvedCommentedFileCount}
+            commentFilter={activeCommentFilter}
+            onCommentFilterChange={
+              commentedFilePaths && unresolvedCommentedFilePaths
+                ? (filter) => setCommentFileFilter(taskId, filter)
+                : undefined
+            }
             linesAdded={linesAdded}
             linesRemoved={linesRemoved}
             allExpanded={allExpanded}
@@ -343,38 +431,7 @@ export function ReviewShell({
               direction="column"
               className="min-w-0 flex-1"
             >
-              {isLoading ? (
-                <Flex
-                  align="center"
-                  justify="center"
-                  className="min-h-0 flex-1"
-                >
-                  <Spinner size="2" />
-                </Flex>
-              ) : isEmpty ? (
-                <Flex
-                  align="center"
-                  justify="center"
-                  className="min-h-0 flex-1"
-                >
-                  <Text color="gray" className="text-sm">
-                    No file changes to review
-                  </Text>
-                </Flex>
-              ) : (
-                <VList
-                  ref={listRef}
-                  bufferSize={REVIEW_LIST_BUFFER_PX}
-                  itemSize={REVIEW_LIST_ESTIMATED_ITEM_SIZE}
-                  className="pierre-scroll-root scrollbar-overlay-y min-h-0 flex-1 overflow-auto bg-(--gray-2)"
-                  shift={false}
-                  style={{ scrollbarGutter: "stable" }}
-                  onScroll={handleScroll}
-                  data={items}
-                >
-                  {renderItem}
-                </VList>
-              )}
+              {reviewContent}
               <PendingReviewBar taskId={taskId} />
             </Flex>
 
diff --git a/packages/ui/src/features/code-review/components/ReviewToolbar.tsx b/packages/ui/src/features/code-review/components/ReviewToolbar.tsx
index f52d39e0d6..5e8ca2ec16 100644
--- a/packages/ui/src/features/code-review/components/ReviewToolbar.tsx
+++ b/packages/ui/src/features/code-review/components/ReviewToolbar.tsx
@@ -16,6 +16,7 @@ import { Tooltip } from "@posthog/ui/primitives/Tooltip";
 import { Flex, Separator, Text } from "@radix-ui/themes";
 import { FoldVertical, Maximize, Minimize, UnfoldVertical } from "lucide-react";
 import { memo } from "react";
+import type { CommentFileFilter } from "../commentFileFilter";
 import { DiffSettingsMenu } from "./DiffSettingsMenu";
 import { DiffSourceSelector } from "./DiffSourceSelector";
 
@@ -23,6 +24,10 @@ interface ReviewToolbarProps {
   taskId: string;
   fileCount: number;
   viewedCount: number;
+  commentedFileCount: number;
+  unresolvedCommentedFileCount: number;
+  commentFilter: CommentFileFilter;
+  onCommentFilterChange?: (filter: CommentFileFilter) => void;
   linesAdded: number;
   linesRemoved: number;
   allExpanded: boolean;
@@ -36,10 +41,47 @@ interface ReviewToolbarProps {
   defaultBranch?: string | null;
 }
 
+function formatFileCount(count: number, suffix: string): string {
+  const noun = count === 1 ? "file" : "files";
+  return `${count} ${noun} ${suffix}`;
+}
+
+function getVisibleFileSummary(
+  commentFilter: CommentFileFilter,
+  fileCount: number,
+  commentedFileCount: number,
+  unresolvedCommentedFileCount: number,
+): { count: number; label: string } {
+  switch (commentFilter) {
+    case "commented":
+      return {
+        count: commentedFileCount,
+        label: formatFileCount(commentedFileCount, "with comments"),
+      };
+    case "unresolved":
+      return {
+        count: unresolvedCommentedFileCount,
+        label: formatFileCount(
+          unresolvedCommentedFileCount,
+          "with unresolved comments",
+        ),
+      };
+    case "none":
+      return {
+        count: fileCount,
+        label: formatFileCount(fileCount, "changed"),
+      };
+  }
+}
+
 export const ReviewToolbar = memo(function ReviewToolbar({
   taskId,
   fileCount,
   viewedCount,
+  commentedFileCount,
+  unresolvedCommentedFileCount,
+  commentFilter,
+  onCommentFilterChange,
   allExpanded,
   onExpandAll,
   onCollapseAll,
@@ -66,6 +108,14 @@ export const ReviewToolbar = memo(function ReviewToolbar({
     setReviewMode(taskId, "closed");
   };
 
+  const { count: visibleFileCount, label: fileCountLabel } =
+    getVisibleFileSummary(
+      commentFilter,
+      fileCount,
+      commentedFileCount,
+      unresolvedCommentedFileCount,
+    );
+
   return (
     <Flex
       id="review-toolbar"
@@ -78,12 +128,10 @@ export const ReviewToolbar = memo(function ReviewToolbar({
       className="sticky top-0 h-[32px] shrink-0 border-b border-b-(--gray-6) bg-(--color-background)"
     >
       <Flex align="center" gap="2">
-        <Text className="font-medium text-[13px]">
-          {fileCount} file{fileCount !== 1 ? "s" : ""} changed
-        </Text>
-        {fileCount > 0 && (
+        <Text className="font-medium text-[13px]">{fileCountLabel}</Text>
+        {visibleFileCount > 0 && (
           <Text className="text-(--gray-10) text-[13px]">
-            {viewedCount}/{fileCount} viewed
+            {viewedCount}/{visibleFileCount} viewed
           </Text>
         )}
         {effectiveSource && (
@@ -163,7 +211,12 @@ export const ReviewToolbar = memo(function ReviewToolbar({
 
         <Separator orientation="vertical" size="1" />
 
-        <DiffSettingsMenu />
+        <DiffSettingsMenu
+          commentedFileCount={commentedFileCount}
+          unresolvedCommentedFileCount={unresolvedCommentedFileCount}
+          commentFilter={commentFilter}
+          onCommentFilterChange={onCommentFilterChange}
+        />
 
         <Tooltip content="Close review">
           <Button size="icon-sm" onClick={handleClose} className="rounded-xs">
diff --git a/packages/ui/src/features/code-review/components/reviewItemBuilders.tsx b/packages/ui/src/features/code-review/components/reviewItemBuilders.tsx
index 5e569f4b09..4a77b6711e 100644
--- a/packages/ui/src/features/code-review/components/reviewItemBuilders.tsx
+++ b/packages/ui/src/features/code-review/components/reviewItemBuilders.tsx
@@ -7,7 +7,7 @@ import {
 import type { PrCommentThread } from "@posthog/core/code-review/types";
 import type { ChangedFile } from "@posthog/shared/domain-types";
 import { makeFileKey } from "../../git-interaction/utils/fileKey";
-import type { ReviewListItem } from "../reviewShellParts";
+import type { ReviewListItem } from "../commentFileFilter";
 import type { DiffOptions } from "../types";
 import { PatchRow, RemoteRow, UntrackedRow } from "./ReviewRows";
 
@@ -73,6 +73,9 @@ export function buildPatchReviewItems({
     return {
       key,
       scrollKey: key,
+      filePaths: [filePath, fileDiff.prevName].filter(
+        (path): path is string => !!path,
+      ),
       node: (
         <PatchRow
           itemKey={key}
@@ -124,6 +127,7 @@ export function buildUntrackedReviewItems({
     return {
       key,
       scrollKey: key,
+      filePaths: [file.path],
       node: (
         <UntrackedRow
           itemKey={key}
@@ -167,6 +171,9 @@ export function buildRemoteReviewItems({
     return {
       key: file.path,
       scrollKey: file.path,
+      filePaths: [file.path, file.originalPath].filter(
+        (path): path is string => !!path,
+      ),
       node: (
         <RemoteRow
           file={file}
diff --git a/packages/ui/src/features/code-review/reviewNavigationStore.test.ts b/packages/ui/src/features/code-review/reviewNavigationStore.test.ts
new file mode 100644
index 0000000000..b6d3f413c1
--- /dev/null
+++ b/packages/ui/src/features/code-review/reviewNavigationStore.test.ts
@@ -0,0 +1,24 @@
+import { beforeEach, describe, expect, it } from "vitest";
+import { useReviewNavigationStore } from "./reviewNavigationStore";
+
+describe("reviewNavigationStore", () => {
+  beforeEach(() => {
+    useReviewNavigationStore.setState({
+      activeFilePaths: {},
+      scrollRequests: {},
+      reviewModes: {},
+      commentFileFilters: {},
+    });
+  });
+
+  it("clears the comment filter when navigating to a file", () => {
+    const store = useReviewNavigationStore.getState();
+    store.setCommentFileFilter("task-1", "unresolved");
+
+    store.requestScrollToFile("task-1", "src/example.ts");
+
+    const state = useReviewNavigationStore.getState();
+    expect(state.scrollRequests["task-1"]).toBe("src/example.ts");
+    expect(state.commentFileFilters["task-1"]).toBe("none");
+  });
+});
diff --git a/packages/ui/src/features/code-review/reviewNavigationStore.ts b/packages/ui/src/features/code-review/reviewNavigationStore.ts
index f74c146998..cd0bf6f739 100644
--- a/packages/ui/src/features/code-review/reviewNavigationStore.ts
+++ b/packages/ui/src/features/code-review/reviewNavigationStore.ts
@@ -1,4 +1,5 @@
 import { create } from "zustand";
+import type { CommentFileFilter } from "./commentFileFilter";
 
 export type ReviewMode = "closed" | "split" | "expanded";
 
@@ -6,6 +7,7 @@ interface ReviewNavigationStoreState {
   activeFilePaths: Record<string, string | null>;
   scrollRequests: Record<string, string | null>;
   reviewModes: Record<string, ReviewMode>;
+  commentFileFilters: Record<string, CommentFileFilter>;
 }
 
 interface ReviewNavigationStoreActions {
@@ -14,6 +16,7 @@ interface ReviewNavigationStoreActions {
   clearScrollRequest: (taskId: string) => void;
   clearTask: (taskId: string) => void;
   setReviewMode: (taskId: string, mode: ReviewMode) => void;
+  setCommentFileFilter: (taskId: string, filter: CommentFileFilter) => void;
   getReviewMode: (taskId: string) => ReviewMode;
 }
 
@@ -25,6 +28,7 @@ export const useReviewNavigationStore = create<ReviewNavigationStore>()(
     activeFilePaths: {},
     scrollRequests: {},
     reviewModes: {},
+    commentFileFilters: {},
 
     setActiveFilePath: (taskId, path) =>
       set((state) => ({
@@ -34,6 +38,10 @@ export const useReviewNavigationStore = create<ReviewNavigationStore>()(
     requestScrollToFile: (taskId, path) =>
       set((state) => ({
         scrollRequests: { ...state.scrollRequests, [taskId]: path },
+        commentFileFilters: {
+          ...state.commentFileFilters,
+          [taskId]: "none",
+        },
       })),
 
     clearScrollRequest: (taskId) =>
@@ -45,6 +53,10 @@ export const useReviewNavigationStore = create<ReviewNavigationStore>()(
       set((state) => ({
         activeFilePaths: { ...state.activeFilePaths, [taskId]: null },
         scrollRequests: { ...state.scrollRequests, [taskId]: null },
+        commentFileFilters: {
+          ...state.commentFileFilters,
+          [taskId]: "none",
+        },
       })),
 
     setReviewMode: (taskId, mode) =>
@@ -52,6 +64,14 @@ export const useReviewNavigationStore = create<ReviewNavigationStore>()(
         reviewModes: { ...state.reviewModes, [taskId]: mode },
       })),
 
+    setCommentFileFilter: (taskId, filter) =>
+      set((state) => ({
+        commentFileFilters: {
+          ...state.commentFileFilters,
+          [taskId]: filter,
+        },
+      })),
+
     getReviewMode: (taskId) => get().reviewModes[taskId] ?? "closed",
   }),
 );
diff --git a/packages/ui/src/features/code-review/reviewShellParts.test.tsx b/packages/ui/src/features/code-review/reviewShellParts.test.tsx
index c51b63a2f9..9fce3a6bfe 100644
--- a/packages/ui/src/features/code-review/reviewShellParts.test.tsx
+++ b/packages/ui/src/features/code-review/reviewShellParts.test.tsx
@@ -14,6 +14,12 @@ vi.mock("../../primitives/FileIcon", () => ({
   FileIcon: () => <span data-testid="file-icon" />,
 }));
 
+import {
+  deriveCommentFileFilterState,
+  filterReviewItemsByFilePaths,
+  getCommentedFilePaths,
+  type ReviewListItem,
+} from "./commentFileFilter";
 import {
   DeferredDiffPlaceholder,
   DiffFileHeader,
@@ -161,3 +167,131 @@ describe("review scroll anchors", () => {
     expect(findActiveScrollKey(root)).toBe("target.ts");
   });
 });
+
+describe("commented file filtering", () => {
+  it("collects paths for all and unresolved comment threads", () => {
+    const commentedPaths = getCommentedFilePaths(
+      new Map([
+        [
+          1,
+          {
+            filePath: "src/commented.ts",
+            isResolved: false,
+            comments: [{ id: 1 }],
+          },
+        ],
+        [
+          2,
+          {
+            filePath: "src/resolved.ts",
+            isResolved: true,
+            comments: [{ id: 2 }],
+          },
+        ],
+        [
+          3,
+          {
+            filePath: "src/empty.ts",
+            isResolved: false,
+            comments: [],
+          },
+        ],
+      ]) as Parameters<typeof getCommentedFilePaths>[0],
+    );
+
+    expect(commentedPaths).toEqual({
+      all: new Set(["src/commented.ts", "src/resolved.ts"]),
+      unresolved: new Set(["src/commented.ts"]),
+    });
+  });
+
+  it("keeps matching files and their section headers", () => {
+    const items: ReviewListItem[] = [
+      { key: "section:staged", node: <span>Staged</span> },
+      {
+        key: "staged:a.ts",
+        filePaths: ["a.ts"],
+        node: <span>A</span>,
+      },
+      {
+        key: "staged:b.ts",
+        filePaths: ["b.ts"],
+        node: <span>B</span>,
+      },
+      { key: "section:changes", node: <span>Changes</span> },
+      {
+        key: "unstaged:c.ts",
+        filePaths: ["c.ts", "old-c.ts"],
+        node: <span>C</span>,
+      },
+    ];
+
+    expect(
+      filterReviewItemsByFilePaths(items, new Set(["b.ts", "old-c.ts"])).map(
+        (item) => item.key,
+      ),
+    ).toEqual([
+      "section:staged",
+      "staged:b.ts",
+      "section:changes",
+      "unstaged:c.ts",
+    ]);
+  });
+
+  it("drops section headers without matching files", () => {
+    const items: ReviewListItem[] = [
+      { key: "section:staged", node: <span>Staged</span> },
+      {
+        key: "staged:a.ts",
+        filePaths: ["a.ts"],
+        node: <span>A</span>,
+      },
+      { key: "section:changes", node: <span>Changes</span> },
+      {
+        key: "unstaged:b.ts",
+        filePaths: ["b.ts"],
+        node: <span>B</span>,
+      },
+    ];
+
+    expect(
+      filterReviewItemsByFilePaths(items, new Set(["b.ts"])).map(
+        (item) => item.key,
+      ),
+    ).toEqual(["section:changes", "unstaged:b.ts"]);
+  });
+
+  it("derives visible items and counts for the selected filter", () => {
+    const items: ReviewListItem[] = [
+      { key: "a.ts", filePaths: ["a.ts"], node: <span>A</span> },
+      { key: "b.ts", filePaths: ["b.ts"], node: <span>B</span> },
+      { key: "c.ts", filePaths: ["c.ts"], node: <span>C</span> },
+    ];
+
+    const state = deriveCommentFileFilterState({
+      items,
+      requestedFilter: "unresolved",
+      commentedFilePaths: new Set(["a.ts", "b.ts"]),
+      unresolvedCommentedFilePaths: new Set(["b.ts"]),
+    });
+
+    expect(state.activeFilter).toBe("unresolved");
+    expect(state.visibleItems.map((item) => item.key)).toEqual(["b.ts"]);
+    expect(state.commentedFileCount).toBe(2);
+    expect(state.unresolvedCommentedFileCount).toBe(1);
+  });
+
+  it("keeps all files visible while comment paths are loading", () => {
+    const items: ReviewListItem[] = [
+      { key: "a.ts", filePaths: ["a.ts"], node: <span>A</span> },
+    ];
+
+    const state = deriveCommentFileFilterState({
+      items,
+      requestedFilter: "unresolved",
+    });
+
+    expect(state.activeFilter).toBe("none");
+    expect(state.visibleItems).toBe(items);
+  });
+});
diff --git a/packages/ui/src/features/code-review/reviewShellParts.tsx b/packages/ui/src/features/code-review/reviewShellParts.tsx
index fa1327522f..4f9da2ab26 100644
--- a/packages/ui/src/features/code-review/reviewShellParts.tsx
+++ b/packages/ui/src/features/code-review/reviewShellParts.tsx
@@ -24,6 +24,7 @@ import { Tooltip } from "../../primitives/Tooltip";
 import { useThemeStore } from "../../shell/themeStore";
 import { useDiffViewerStore } from "../code-editor/diffViewerStore";
 import { computeDiffStats } from "../git-interaction/utils/diffStats";
+import type { ReviewListItem } from "./commentFileFilter";
 import { useReviewViewedContext } from "./reviewViewedContext";
 import { useReviewViewedStore } from "./reviewViewedStore";
 
@@ -32,6 +33,7 @@ export {
   buildItemIndex,
   splitFilePath,
 } from "@posthog/core/code-review/reviewShellGeometry";
+export type { ReviewListItem } from "./commentFileFilter";
 
 const STICKY_HEADER_CSS = `[data-diffs-header] { position: sticky; top: 0; z-index: 1; background: var(--gray-2); }`;
 const SCROLL_ANCHOR_SELECTOR = "[data-scroll-key]";
@@ -207,7 +209,8 @@ export interface ReviewShellProps {
   isLoading: boolean;
   isEmpty: boolean;
   items: ReviewListItem[];
-  itemIndexByFilePath: Map<string, number>;
+  commentedFilePaths?: ReadonlySet<string>;
+  unresolvedCommentedFilePaths?: ReadonlySet<string>;
   currentSignatures: Map<string, string>;
   viewedRecord: Record<string, string>;
   onToggleViewed: (key: string, sig: string | null) => void;
@@ -224,12 +227,6 @@ export interface ReviewShellProps {
   defaultBranch?: string | null;
 }
 
-export interface ReviewListItem {
-  key: string;
-  scrollKey?: string;
-  node: ReactNode;
-}
-
 export function FileHeaderRow({
   dirPath,
   fileName,
diff --git a/packages/ui/src/features/git-interaction/usePrDetails.ts b/packages/ui/src/features/git-interaction/usePrDetails.ts
index 270309103b..03cc9512e9 100644
--- a/packages/ui/src/features/git-interaction/usePrDetails.ts
+++ b/packages/ui/src/features/git-interaction/usePrDetails.ts
@@ -85,5 +85,6 @@ export function usePrDetails(
       isLoading: metaQuery.isLoading,
     },
     commentThreads,
+    commentsLoading: commentsQuery.isLoading,
   };
 }