diff --git a/frontend/src/components/diagnostics/figureGallery.tsx b/frontend/src/components/diagnostics/figureGallery.tsx
index 80f74c5..266b1ea 100644
--- a/frontend/src/components/diagnostics/figureGallery.tsx
+++ b/frontend/src/components/diagnostics/figureGallery.tsx
@@ -25,6 +25,10 @@ import {
 } from "@/components/ui/select.tsx";
 import { FigureGalleryModal } from "./figureGalleryModal.tsx";
 import { FigureGallerySkeleton } from "./figureGallerySkeleton.tsx";
+import {
+  matchesSelectorFilters,
+  SelectorFilterPanel,
+} from "./selectorFilterPanel.tsx";
 
 interface DiagnosticFigureGalleryProps {
   providerSlug: string;
@@ -71,6 +75,9 @@ export function FigureGallery({
 }: DiagnosticFigureGalleryProps) {
   const [filter, setFilter] = useState("");
   const [selectedGroup, setSelectedGroup] = useState<string>("all");
+  const [selectorFilters, setSelectorFilters] = useState<
+    Record<string, string[]>
+  >({});
   const [selectedFigureIndex, setSelectedFigureIndex] = useState<number | null>(
     null,
   );
@@ -117,6 +124,9 @@ export function FigureGallery({
     ) {
       return false;
     }
+    if (!matchesSelectorFilters(executionGroup.selectors, selectorFilters)) {
+      return false;
+    }
     if (filter) {
       try {
         const regex = new RegExp(filter, "i");
@@ -189,6 +199,12 @@ export function FigureGallery({
         </div>
       </div>
 
+      <SelectorFilterPanel
+        executionGroups={executionGroups?.data ?? []}
+        filters={selectorFilters}
+        onFiltersChange={setSelectorFilters}
+      />
+
       {filteredFigures.length > 0 ? (
         <div
           className="relative"
diff --git a/frontend/src/components/diagnostics/selectorFilterPanel.tsx b/frontend/src/components/diagnostics/selectorFilterPanel.tsx
new file mode 100644
index 0000000..ac2939c
--- /dev/null
+++ b/frontend/src/components/diagnostics/selectorFilterPanel.tsx
@@ -0,0 +1,199 @@
+import { Check, X } from "lucide-react";
+import { useMemo } from "react";
+import type { ExecutionGroup } from "@/client";
+import { Badge } from "@/components/ui/badge.tsx";
+import { Button } from "@/components/ui/button.tsx";
+import {
+  Command,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+  CommandList,
+} from "@/components/ui/command.tsx";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover.tsx";
+import { cn } from "@/lib/utils";
+
+interface SelectorFacet {
+  key: string;
+  values: string[];
+}
+
+interface SelectorFilterPanelProps {
+  executionGroups: ExecutionGroup[];
+  filters: Record<string, string[]>;
+  onFiltersChange: (filters: Record<string, string[]>) => void;
+}
+
+function extractSelectorFacets(groups: ExecutionGroup[]): SelectorFacet[] {
+  const facetMap = new Map<string, Set<string>>();
+  for (const group of groups) {
+    for (const pairs of Object.values(group.selectors)) {
+      for (const [key, value] of pairs) {
+        if (!facetMap.has(key)) {
+          facetMap.set(key, new Set());
+        }
+        facetMap.get(key)!.add(value);
+      }
+    }
+  }
+  return Array.from(facetMap.entries())
+    .map(([key, values]) => ({
+      key,
+      values: Array.from(values).sort(),
+    }))
+    .sort((a, b) => a.key.localeCompare(b.key));
+}
+
+export function matchesSelectorFilters(
+  selectors: ExecutionGroup["selectors"],
+  filters: Record<string, string[]>,
+): boolean {
+  for (const [filterKey, filterValues] of Object.entries(filters)) {
+    if (filterValues.length === 0) continue;
+    const groupValues = Object.values(selectors).flatMap((pairs) =>
+      pairs.filter(([k]) => k === filterKey).map(([, v]) => v),
+    );
+    if (!filterValues.some((v) => groupValues.includes(v))) {
+      return false;
+    }
+  }
+  return true;
+}
+
+function MultiSelectFacet({
+  facet,
+  selected,
+  onSelectionChange,
+}: {
+  facet: SelectorFacet;
+  selected: string[];
+  onSelectionChange: (values: string[]) => void;
+}) {
+  return (
+    <Popover>
+      <PopoverTrigger asChild>
+        <Button variant="outline" size="sm" className="h-8">
+          {facet.key}
+          {selected.length > 0 && (
+            <Badge variant="secondary" className="ml-1 px-1">
+              {selected.length}
+            </Badge>
+          )}
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent className="w-[220px] p-0" align="start">
+        <Command>
+          <CommandInput placeholder={`Search ${facet.key}...`} />
+          <CommandList>
+            <CommandEmpty>No values found.</CommandEmpty>
+            <CommandGroup>
+              {facet.values.map((value) => {
+                const isSelected = selected.includes(value);
+                return (
+                  <CommandItem
+                    key={value}
+                    value={value}
+                    onSelect={() => {
+                      onSelectionChange(
+                        isSelected
+                          ? selected.filter((v) => v !== value)
+                          : [...selected, value],
+                      );
+                    }}
+                  >
+                    <div
+                      className={cn(
+                        "mr-2 flex h-4 w-4 items-center justify-center rounded-sm border border-primary",
+                        isSelected
+                          ? "bg-primary text-primary-foreground"
+                          : "opacity-50 [&_svg]:invisible",
+                      )}
+                    >
+                      <Check className="h-4 w-4" />
+                    </div>
+                    <span>{value}</span>
+                  </CommandItem>
+                );
+              })}
+            </CommandGroup>
+          </CommandList>
+        </Command>
+      </PopoverContent>
+    </Popover>
+  );
+}
+
+export function SelectorFilterPanel({
+  executionGroups,
+  filters,
+  onFiltersChange,
+}: SelectorFilterPanelProps) {
+  const facets = useMemo(
+    () => extractSelectorFacets(executionGroups),
+    [executionGroups],
+  );
+
+  const hasActiveFilters = Object.values(filters).some((v) => v.length > 0);
+
+  if (facets.length === 0) return null;
+
+  return (
+    <div className="space-y-2">
+      <div className="flex items-center gap-2 flex-wrap">
+        <span className="text-sm text-muted-foreground">Selectors:</span>
+        {facets.map((facet) => (
+          <MultiSelectFacet
+            key={facet.key}
+            facet={facet}
+            selected={filters[facet.key] ?? []}
+            onSelectionChange={(values) =>
+              onFiltersChange({ ...filters, [facet.key]: values })
+            }
+          />
+        ))}
+        {hasActiveFilters && (
+          <Button
+            variant="ghost"
+            size="sm"
+            className="h-8"
+            onClick={() => onFiltersChange({})}
+          >
+            Clear all
+          </Button>
+        )}
+      </div>
+      {hasActiveFilters && (
+        <div className="flex items-center gap-1 flex-wrap">
+          {Object.entries(filters).flatMap(([key, values]) =>
+            values.map((value) => (
+              <Badge
+                key={`${key}:${value}`}
+                variant="secondary"
+                className="gap-1"
+              >
+                {key}: {value}
+                <button
+                  type="button"
+                  className="ml-1 rounded-full outline-none focus:ring-2 focus:ring-ring"
+                  onClick={() =>
+                    onFiltersChange({
+                      ...filters,
+                      [key]: values.filter((v) => v !== value),
+                    })
+                  }
+                >
+                  <X className="h-3 w-3" />
+                </button>
+              </Badge>
+            )),
+          )}
+        </div>
+      )}
+    </div>
+  );
+}