diff --git a/src/components/BulkActionBar.tsx b/src/components/BulkActionBar.tsx
index e3e480f..699c1e3 100644
--- a/src/components/BulkActionBar.tsx
+++ b/src/components/BulkActionBar.tsx
@@ -1,12 +1,14 @@
 import { useEffect, useRef, useState } from "react";
 import { useGalleryStore } from "../store";
-import { AlbumPicker } from "./AlbumPicker";
+import { BulkAlbumPopover } from "./bulk/BulkAlbumPopover";
+import { BulkDeleteConfirm } from "./bulk/BulkDeleteConfirm";
+import { BulkRatingPopover } from "./bulk/BulkRatingPopover";
+import { BulkSelectionSummary } from "./bulk/BulkSelectionSummary";
 import { BulkTagPopover } from "./bulk/BulkTagPopover";
+import { type BulkPanel } from "./bulk/types";
 import { useDismissable } from "./menu";
-import { Tooltip } from "./Tooltip"
-import { CloseIcon, StarIcon, WarningIcon } from "./icons";
-
-type Panel = "tag" | "rating" | "album" | "delete" | null;
+import { Tooltip } from "./Tooltip";
+import { CloseIcon } from "./icons";
 
 export function BulkActionBar() {
   const selectedCount = useGalleryStore((state) => state.gallerySelectedIds.size);
@@ -23,7 +25,7 @@ export function BulkActionBar() {
   const addToAlbum = useGalleryStore((state) => state.addToAlbum);
   const removeFromAlbum = useGalleryStore((state) => state.removeFromAlbum);
 
-  const [panel, setPanel] = useState<Panel>(null);
+  const [panel, setPanel] = useState<BulkPanel>(null);
   const [deleting, setDeleting] = useState(false);
   const barRef = useRef<HTMLDivElement>(null);
 
@@ -39,7 +41,7 @@ export function BulkActionBar() {
 
   const ids = Array.from(selectedIds);
   const inAlbumView = activeView === "album" && selectedAlbumId !== null;
-  const togglePanel = (next: Exclude<Panel, null>) => setPanel((current) => (current === next ? null : next));
+  const togglePanel = (next: Exclude<BulkPanel, null>) => setPanel((current) => (current === next ? null : next));
 
   const handleDelete = async () => {
     setDeleting(true);
@@ -66,19 +68,12 @@ export function BulkActionBar() {
       className="pointer-events-auto absolute bottom-6 left-1/2 z-30 flex -translate-x-1/2 items-center gap-1 rounded-xl border border-white/10 bg-gray-950/95 px-2 py-1.5 shadow-2xl shadow-black/50 backdrop-blur"
       onClick={(event) => event.stopPropagation()}
     >
-      <div className="flex items-center gap-2 px-1.5">
-        <span className="text-xs font-medium text-white">{selectedCount} selected</span>
-        {loadedCount < totalImages || loadedCount > selectedCount ? (
-          <Tooltip label={loadedCount < totalImages ? "Selects loaded items only" : "Select all loaded"}>
-          <button
-            className="text-[11px] text-gray-500 transition-colors hover:text-gray-300"
-            onClick={selectAllGallery}
-          >
-            Select all{loadedCount < totalImages ? " loaded" : ""}
-          </button>
-        </Tooltip>
-      ) : null}
-      </div>
+      <BulkSelectionSummary
+        loadedCount={loadedCount}
+        selectedCount={selectedCount}
+        totalImages={totalImages}
+        onSelectAll={selectAllGallery}
+      />
 
       <div className="h-5 w-px bg-white/10" />
 
@@ -93,39 +88,7 @@ export function BulkActionBar() {
         <button className={panel === "rating" ? btnActive : btnIdle} onClick={() => togglePanel("rating")}>
           Rating
         </button>
-        {panel === "rating" ? (
-          <div
-            data-bulk-popover
-            className="absolute bottom-full left-1/2 mb-2 flex -translate-x-1/2 items-center gap-1 rounded-xl border border-white/10 bg-gray-950/98 p-2 shadow-2xl backdrop-blur"
-          >
-            {Array.from({ length: 5 }, (_, index) => {
-              const rating = index + 1;
-              return (
-                <Tooltip label={`Set ${rating} star${rating === 1 ? "" : "s"}`}>
-                <button
-                  key={rating}
-                  className="rounded-md p-1 text-white/25 transition-colors hover:bg-white/5 hover:text-amber-300"
-                  onClick={async () => {
-                    await bulkSetRating(rating);
-                    setPanel(null);
-                  }}
-                >
-                  <StarIcon className="h-4 w-4" />
-                </button>
-                </Tooltip>
-              );
-            })}
-            <button
-              className="ml-1 rounded-md border border-white/10 px-2 py-1 text-[11px] text-gray-400 transition-colors hover:bg-white/5 hover:text-white"
-              onClick={async () => {
-                await bulkSetRating(0);
-                setPanel(null);
-              }}
-            >
-              Clear
-            </button>
-          </div>
-        ) : null}
+        {panel === "rating" ? <BulkRatingPopover onSetRating={bulkSetRating} onClose={() => setPanel(null)} /> : null}
       </div>
       <Tooltip label="Mark as favorite" followCursor>
         <button className={btnIdle} onClick={() => void bulkSetFavorite(true)}>
@@ -136,14 +99,7 @@ export function BulkActionBar() {
         <button className={panel === "album" ? btnActive : btnIdle} onClick={() => togglePanel("album")}>
           Add to album
         </button>
-        {panel === "album" ? (
-          <div
-            data-bulk-popover
-            className="absolute bottom-full left-1/2 mb-2 w-60 -translate-x-1/2 rounded-xl border border-white/10 bg-gray-950/98 p-2 shadow-2xl backdrop-blur"
-          >
-            <AlbumPicker onPick={handlePickAlbum} />
-          </div>
-        ) : null}
+        {panel === "album" ? <BulkAlbumPopover onPick={handlePickAlbum} /> : null}
       </div>
 
       {inAlbumView ? (
@@ -159,52 +115,34 @@ export function BulkActionBar() {
 
       <div className="relative">
         <Tooltip label="Delete files from disk" followCursor>
-        <button
-          className={panel === "delete" ? `${btn} bg-red-500/15 text-red-300` : `${btn} text-gray-300 hover:bg-red-500/10 hover:text-red-300`}
-          onClick={() => togglePanel("delete")}
-          disabled={deleting}
-        >
-          {deleting ? "Deleting…" : "Delete"}
-        </button>
+          <button
+            className={
+              panel === "delete"
+                ? `${btn} bg-red-500/15 text-red-300`
+                : `${btn} text-gray-300 hover:bg-red-500/10 hover:text-red-300`
+            }
+            onClick={() => togglePanel("delete")}
+            disabled={deleting}
+          >
+            {deleting ? "Deleting…" : "Delete"}
+          </button>
         </Tooltip>
         {panel === "delete" ? (
-          <div
-            data-bulk-popover
-            className="absolute bottom-full left-1/2 mb-2 w-64 -translate-x-1/2 rounded-xl border border-red-500/30 bg-gray-950/98 p-3 shadow-2xl backdrop-blur"
-          >
-            <div className="mb-1 flex items-center gap-1.5 text-red-300">
-              <WarningIcon className="h-3.5 w-3.5 shrink-0" />
-              <p className="text-xs font-semibold">Delete from disk</p>
-            </div>
-            <p className="mb-2.5 text-[11px] leading-relaxed text-gray-400">
-              Permanently delete {selectedCount} file{selectedCount === 1 ? "" : "s"} from your computer.
-              This removes the actual file{selectedCount === 1 ? "" : "s"} from disk and cannot be undone.
-            </p>
-            <div className="flex justify-end gap-1.5">
-              <button
-                className="rounded-md border border-white/10 bg-white/5 px-2.5 py-1 text-[11px] text-gray-300 transition-colors hover:bg-white/10 hover:text-white"
-                onClick={() => setPanel(null)}
-              >
-                Cancel
-              </button>
-              <button
-                className="rounded-md bg-red-500/20 px-2.5 py-1 text-[11px] font-medium text-red-300 transition-colors hover:bg-red-500/30 hover:text-red-200 disabled:opacity-50"
-                onClick={() => void handleDelete()}
-                disabled={deleting}
-              >
-                {deleting ? "Deleting…" : `Delete ${selectedCount} from disk`}
-              </button>
-            </div>
-          </div>
+          <BulkDeleteConfirm
+            deleting={deleting}
+            selectedCount={selectedCount}
+            onCancel={() => setPanel(null)}
+            onDelete={handleDelete}
+          />
         ) : null}
       </div>
-        <Tooltip label="Clear selection" followCursor>
-      <button
-        className="rounded-md p-1.5 text-gray-500 transition-colors hover:bg-white/[0.06] hover:text-white"
-        onClick={clearGallerySelection}
-      >
-        <CloseIcon className="h-4 w-4" />
-      </button>
+      <Tooltip label="Clear selection" followCursor>
+        <button
+          className="rounded-md p-1.5 text-gray-500 transition-colors hover:bg-white/[0.06] hover:text-white"
+          onClick={clearGallerySelection}
+        >
+          <CloseIcon className="h-4 w-4" />
+        </button>
       </Tooltip>
     </div>
   );
diff --git a/src/components/bulk/BulkAlbumPopover.tsx b/src/components/bulk/BulkAlbumPopover.tsx
new file mode 100644
index 0000000..b52e4e2
--- /dev/null
+++ b/src/components/bulk/BulkAlbumPopover.tsx
@@ -0,0 +1,16 @@
+import { AlbumPicker } from "../AlbumPicker";
+
+interface BulkAlbumPopoverProps {
+  onPick: (albumId: number) => Promise<void>;
+}
+
+export function BulkAlbumPopover({ onPick }: BulkAlbumPopoverProps) {
+  return (
+    <div
+      data-bulk-popover
+      className="absolute bottom-full left-1/2 mb-2 w-60 -translate-x-1/2 rounded-xl border border-white/10 bg-gray-950/98 p-2 shadow-2xl backdrop-blur"
+    >
+      <AlbumPicker onPick={(albumId) => void onPick(albumId)} />
+    </div>
+  );
+}
diff --git a/src/components/bulk/BulkDeleteConfirm.tsx b/src/components/bulk/BulkDeleteConfirm.tsx
new file mode 100644
index 0000000..1c41558
--- /dev/null
+++ b/src/components/bulk/BulkDeleteConfirm.tsx
@@ -0,0 +1,41 @@
+import { WarningIcon } from "../icons";
+
+interface BulkDeleteConfirmProps {
+  deleting: boolean;
+  selectedCount: number;
+  onCancel: () => void;
+  onDelete: () => Promise<void>;
+}
+
+export function BulkDeleteConfirm({ deleting, selectedCount, onCancel, onDelete }: BulkDeleteConfirmProps) {
+  return (
+    <div
+      data-bulk-popover
+      className="absolute bottom-full left-1/2 mb-2 w-64 -translate-x-1/2 rounded-xl border border-red-500/30 bg-gray-950/98 p-3 shadow-2xl backdrop-blur"
+    >
+      <div className="mb-1 flex items-center gap-1.5 text-red-300">
+        <WarningIcon className="h-3.5 w-3.5 shrink-0" />
+        <p className="text-xs font-semibold">Delete from disk</p>
+      </div>
+      <p className="mb-2.5 text-[11px] leading-relaxed text-gray-400">
+        Permanently delete {selectedCount} file{selectedCount === 1 ? "" : "s"} from your computer. This removes
+        the actual file{selectedCount === 1 ? "" : "s"} from disk and cannot be undone.
+      </p>
+      <div className="flex justify-end gap-1.5">
+        <button
+          className="rounded-md border border-white/10 bg-white/5 px-2.5 py-1 text-[11px] text-gray-300 transition-colors hover:bg-white/10 hover:text-white"
+          onClick={onCancel}
+        >
+          Cancel
+        </button>
+        <button
+          className="rounded-md bg-red-500/20 px-2.5 py-1 text-[11px] font-medium text-red-300 transition-colors hover:bg-red-500/30 hover:text-red-200 disabled:opacity-50"
+          onClick={() => void onDelete()}
+          disabled={deleting}
+        >
+          {deleting ? "Deleting…" : `Delete ${selectedCount} from disk`}
+        </button>
+      </div>
+    </div>
+  );
+}
diff --git a/src/components/bulk/BulkRatingPopover.tsx b/src/components/bulk/BulkRatingPopover.tsx
new file mode 100644
index 0000000..3728c72
--- /dev/null
+++ b/src/components/bulk/BulkRatingPopover.tsx
@@ -0,0 +1,41 @@
+import { Tooltip } from "../Tooltip";
+import { StarIcon } from "../icons";
+
+interface BulkRatingPopoverProps {
+  onClose: () => void;
+  onSetRating: (rating: number) => Promise<void>;
+}
+
+export function BulkRatingPopover({ onClose, onSetRating }: BulkRatingPopoverProps) {
+  const setRating = async (rating: number) => {
+    await onSetRating(rating);
+    onClose();
+  };
+
+  return (
+    <div
+      data-bulk-popover
+      className="absolute bottom-full left-1/2 mb-2 flex -translate-x-1/2 items-center gap-1 rounded-xl border border-white/10 bg-gray-950/98 p-2 shadow-2xl backdrop-blur"
+    >
+      {Array.from({ length: 5 }, (_, index) => {
+        const rating = index + 1;
+        return (
+          <Tooltip key={rating} label={`Set ${rating} star${rating === 1 ? "" : "s"}`}>
+            <button
+              className="rounded-md p-1 text-white/25 transition-colors hover:bg-white/5 hover:text-amber-300"
+              onClick={() => void setRating(rating)}
+            >
+              <StarIcon className="h-4 w-4" />
+            </button>
+          </Tooltip>
+        );
+      })}
+      <button
+        className="ml-1 rounded-md border border-white/10 px-2 py-1 text-[11px] text-gray-400 transition-colors hover:bg-white/5 hover:text-white"
+        onClick={() => void setRating(0)}
+      >
+        Clear
+      </button>
+    </div>
+  );
+}
diff --git a/src/components/bulk/BulkSelectionSummary.tsx b/src/components/bulk/BulkSelectionSummary.tsx
new file mode 100644
index 0000000..27f1913
--- /dev/null
+++ b/src/components/bulk/BulkSelectionSummary.tsx
@@ -0,0 +1,30 @@
+import { Tooltip } from "../Tooltip";
+
+interface BulkSelectionSummaryProps {
+  loadedCount: number;
+  selectedCount: number;
+  totalImages: number;
+  onSelectAll: () => void;
+}
+
+export function BulkSelectionSummary({
+  loadedCount,
+  selectedCount,
+  totalImages,
+  onSelectAll,
+}: BulkSelectionSummaryProps) {
+  const showSelectAll = loadedCount < totalImages || loadedCount > selectedCount;
+
+  return (
+    <div className="flex items-center gap-2 px-1.5">
+      <span className="text-xs font-medium text-white">{selectedCount} selected</span>
+      {showSelectAll ? (
+        <Tooltip label={loadedCount < totalImages ? "Selects loaded items only" : "Select all loaded"}>
+          <button className="text-[11px] text-gray-500 transition-colors hover:text-gray-300" onClick={onSelectAll}>
+            Select all{loadedCount < totalImages ? " loaded" : ""}
+          </button>
+        </Tooltip>
+      ) : null}
+    </div>
+  );
+}
diff --git a/src/components/bulk/types.ts b/src/components/bulk/types.ts
new file mode 100644
index 0000000..7f0aac5
--- /dev/null
+++ b/src/components/bulk/types.ts
@@ -0,0 +1 @@
+export type BulkPanel = "tag" | "rating" | "album" | "delete" | null;