diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx
index ed51b35c2dd..1ff942d392f 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx
@@ -7,8 +7,10 @@ import usePartner from "@/lib/swr/use-partner";
 import usePartnersCount from "@/lib/swr/use-partners-count";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { EnrolledPartnerProps, PartnerPlatformProps } from "@/lib/types";
-import { useApprovePartnerApplicationModal } from "@/ui/modals/approve-partner-application-modal";
-import { useBulkApprovePartnersModal } from "@/ui/modals/bulk-approve-partners-modal";
+import {
+  type BulkApprovePartnersPayload,
+  useBulkApprovePartnersModal,
+} from "@/ui/modals/bulk-approve-partners-modal";
 import { useBulkRejectPartnersModal } from "@/ui/modals/bulk-reject-partners-modal";
 import { useRejectPartnerApplicationModal } from "@/ui/modals/reject-partner-application-modal";
 import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";
@@ -139,18 +141,12 @@ export function ProgramPartnersApplicationsPageClient() {
     });
 
   // State for pending bulk actions
-  const [pendingApprovePartners, setPendingApprovePartners] = useState<
-    EnrolledPartnerProps[]
-  >([]);
-
   const [pendingRejectPartners, setPendingRejectPartners] = useState<
     EnrolledPartnerProps[]
   >([]);
 
-  const { setShowBulkApprovePartnersModal, BulkApprovePartnersModal } =
-    useBulkApprovePartnersModal({
-      partners: pendingApprovePartners,
-    });
+  const { openBulkApprove, BulkApprovePartnersModal } =
+    useBulkApprovePartnersModal();
 
   const { setShowBulkRejectPartnersModal, BulkRejectPartnersModal } =
     useBulkRejectPartnersModal({
@@ -334,11 +330,11 @@ export function ProgramPartnersApplicationsPageClient() {
         enableHiding: false,
         header: ({ table }) => <EditColumnsButton table={table} />,
         cell: ({ row }) => (
-          <RowMenuButton row={row} workspaceId={workspaceId!} />
+          <RowMenuButton row={row} openBulkApprove={openBulkApprove} />
         ),
       },
     ],
-    [workspaceId, groups, platformsMapByPartnerId],
+    [openBulkApprove, groups, platformsMapByPartnerId],
   );
 
   const { table, ...tableProps } = useTable<EnrolledPartnerProps>({
@@ -382,8 +378,7 @@ export function ProgramPartnersApplicationsPageClient() {
               .getSelectedRowModel()
               .rows.map((row) => row.original);
 
-            setPendingApprovePartners(partners);
-            setShowBulkApprovePartnersModal(true);
+            openBulkApprove({ partners });
           }}
         />
         <Button
@@ -433,6 +428,7 @@ export function ProgramPartnersApplicationsPageClient() {
             setDetailsSheetState((s) => ({ ...s, open }) as any)
           }
           partner={currentPartner}
+          onOpenBulkApprove={openBulkApprove}
           onPrevious={
             previousPartnerId
               ? () =>
@@ -506,24 +502,13 @@ export function ProgramPartnersApplicationsPageClient() {
 
 function RowMenuButton({
   row,
-  workspaceId,
+  openBulkApprove,
 }: {
   row: Row<EnrolledPartnerProps>;
-  workspaceId: string;
+  openBulkApprove: (payload: BulkApprovePartnersPayload) => void;
 }) {
   const [isOpen, setIsOpen] = useState(false);
 
-  const {
-    ApprovePartnerApplicationModal,
-    setShowApprovePartnerApplicationModal,
-  } = useApprovePartnerApplicationModal({
-    partner: row.original,
-    groupId: row.original.groupId,
-    onConfirm: async () => {
-      await mutatePrefix(["/api/partners", "/api/partners/count"]);
-    },
-  });
-
   const {
     RejectPartnerApplicationModal,
     setShowRejectPartnerApplicationModal,
@@ -536,7 +521,6 @@ function RowMenuButton({
 
   return (
     <>
-      {ApprovePartnerApplicationModal}
       {RejectPartnerApplicationModal}
       <Popover
         openPopover={isOpen}
@@ -549,7 +533,7 @@ function RowMenuButton({
                 icon={UserCheck}
                 onSelect={() => {
                   setIsOpen(false);
-                  setShowApprovePartnerApplicationModal(true);
+                  openBulkApprove({ partners: [row.original] });
                 }}
               >
                 Approve application
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page-client.tsx
index 886d607f149..62d72920c9c 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page-client.tsx
@@ -8,6 +8,7 @@ import usePartner from "@/lib/swr/use-partner";
 import usePartnersCount from "@/lib/swr/use-partners-count";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { EnrolledPartnerProps, PartnerPlatformProps } from "@/lib/types";
+import { useBulkApprovePartnersModal } from "@/ui/modals/bulk-approve-partners-modal";
 import { useConfirmModal } from "@/ui/modals/confirm-modal";
 import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";
 import { PartnerApplicationSheet } from "@/ui/partners/partner-application-sheet";
@@ -135,6 +136,9 @@ export function ProgramPartnersRejectedApplicationsPageClient() {
       partnerId: detailsSheetState.partnerId,
     });
 
+  const { openBulkApprove, BulkApprovePartnersModal } =
+    useBulkApprovePartnersModal();
+
   const { columnVisibility, setColumnVisibility } = useColumnVisibility(
     "applications-table-columns",
     applicationsColumns,
@@ -378,6 +382,7 @@ export function ProgramPartnersRejectedApplicationsPageClient() {
             setDetailsSheetState((s) => ({ ...s, open }) as any)
           }
           partner={currentPartner}
+          onOpenBulkApprove={openBulkApprove}
           onPrevious={
             previousPartnerId
               ? () =>
@@ -398,6 +403,7 @@ export function ProgramPartnersRejectedApplicationsPageClient() {
           }
         />
       )}
+      <BulkApprovePartnersModal />
       <div>
         <div className="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
           <Filter.Select
diff --git a/apps/web/ui/modals/bulk-approve-partners-modal.tsx b/apps/web/ui/modals/bulk-approve-partners-modal.tsx
index 4d363d51ae6..ed44b7a995a 100644
--- a/apps/web/ui/modals/bulk-approve-partners-modal.tsx
+++ b/apps/web/ui/modals/bulk-approve-partners-modal.tsx
@@ -1,3 +1,4 @@
+import { approvePartnerAction } from "@/lib/actions/partners/approve-partner";
 import { bulkApprovePartnersAction } from "@/lib/actions/partners/bulk-approve-partners";
 import { mutatePrefix } from "@/lib/swr/mutate";
 import useProgram from "@/lib/swr/use-program";
@@ -5,63 +6,134 @@ import useWorkspace from "@/lib/swr/use-workspace";
 import { EnrolledPartnerProps } from "@/lib/types";
 import { GroupSelector } from "@/ui/partners/groups/group-selector";
 import { PartnerAvatar } from "@/ui/partners/partner-avatar";
-import { Button, Modal } from "@dub/ui";
+import { Button, Modal, useKeyboardShortcut } from "@dub/ui";
 import { cn, pluralize } from "@dub/utils";
 import { useAction } from "next-safe-action/hooks";
 import {
   Dispatch,
   SetStateAction,
   useCallback,
+  useEffect,
   useMemo,
+  useRef,
   useState,
 } from "react";
 import { toast } from "sonner";
 
+export type BulkApprovePartnersPayload = {
+  partners: EnrolledPartnerProps[];
+  initialGroupId?: string | null;
+  onApproveSuccess?: () => void | Promise<void>;
+  /** When opening over the application sheet, pass `{ modal: true, sheet: true }` so the Approve shortcut still fires. */
+  keyboardShortcutOptions?: { modal?: boolean; sheet?: boolean };
+};
+
 function BulkApprovePartnersModal({
-  showBulkApprovePartnersModal,
-  setShowBulkApprovePartnersModal,
-  partners,
+  bulkApprovePayload,
+  setBulkApprovePayload,
 }: {
-  showBulkApprovePartnersModal: boolean;
-  setShowBulkApprovePartnersModal: Dispatch<SetStateAction<boolean>>;
-  partners: EnrolledPartnerProps[];
+  bulkApprovePayload: BulkApprovePartnersPayload | null;
+  setBulkApprovePayload: Dispatch<
+    SetStateAction<BulkApprovePartnersPayload | null>
+  >;
 }) {
   const { id: workspaceId } = useWorkspace();
   const { program } = useProgram();
 
+  const partners = bulkApprovePayload?.partners ?? [];
+  const showModal = Boolean(bulkApprovePayload && partners.length > 0);
+
+  const payloadRef = useRef(bulkApprovePayload);
+  payloadRef.current = bulkApprovePayload;
+
   const [selectedGroupId, setSelectedGroupId] = useState<string | null>(
     program?.defaultGroupId ?? null,
   );
 
-  const { executeAsync, isPending } = useAction(bulkApprovePartnersAction, {
-    onSuccess: async () => {
-      setShowBulkApprovePartnersModal(false);
-      await mutatePrefix("/api/partners");
-      toast.success(`${pluralize("Partner", partners.length)} approved.`);
-    },
-    onError({ error }) {
-      toast.error(error.serverError);
-    },
-  });
+  const runAfterApproveSuccess = useCallback(async () => {
+    const payload = payloadRef.current;
+    const onApproveSuccess = payload?.onApproveSuccess;
+    const count = payload?.partners.length ?? 0;
+    setBulkApprovePayload(null);
+    await mutatePrefix(["/api/partners", "/api/partners/count"]);
+    toast.success(`${pluralize("Partner", count)} approved.`);
+    await onApproveSuccess?.();
+  }, [setBulkApprovePayload]);
+
+  const { executeAsync: bulkExecuteAsync, isPending: isBulkPending } =
+    useAction(bulkApprovePartnersAction, {
+      onSuccess: runAfterApproveSuccess,
+      onError({ error }) {
+        toast.error(error.serverError);
+      },
+    });
+
+  const { executeAsync: singleExecuteAsync, isPending: isSinglePending } =
+    useAction(approvePartnerAction, {
+      onSuccess: runAfterApproveSuccess,
+      onError: ({ error }) => {
+        toast.error(error.serverError || "Failed to approve partner.");
+      },
+    });
+
+  useEffect(() => {
+    if (!bulkApprovePayload || !showModal) return;
 
-  const handleBulkApprove = async () => {
-    const partnerIds = partners.map((p) => p.id);
+    const { partners: p, initialGroupId } = bulkApprovePayload;
+    const defaultGroup = program?.defaultGroupId ?? null;
 
-    if (!workspaceId || partnerIds.length === 0) {
-      return;
+    if (initialGroupId !== undefined) {
+      setSelectedGroupId(initialGroupId ?? defaultGroup);
+    } else if (p.length === 1) {
+      setSelectedGroupId(p[0].groupId ?? defaultGroup);
+    } else {
+      setSelectedGroupId(defaultGroup);
     }
+  }, [bulkApprovePayload, program?.defaultGroupId, showModal]);
 
-    await executeAsync({
-      workspaceId,
-      partnerIds,
-      groupId: selectedGroupId,
-    });
-  };
+  const handleApprove = useCallback(async () => {
+    if (!workspaceId || partners.length === 0) return;
+
+    const useSingleRejectedApprove =
+      partners.length === 1 && partners[0].status === "rejected";
+
+    if (useSingleRejectedApprove) {
+      await singleExecuteAsync({
+        workspaceId,
+        partnerId: partners[0].id,
+        groupId: selectedGroupId ?? undefined,
+      });
+    } else {
+      await bulkExecuteAsync({
+        workspaceId,
+        partnerIds: partners.map((p) => p.id),
+        groupId: selectedGroupId,
+      });
+    }
+  }, [
+    workspaceId,
+    partners,
+    selectedGroupId,
+    bulkExecuteAsync,
+    singleExecuteAsync,
+  ]);
+
+  const isPending = isBulkPending || isSinglePending;
+
+  useKeyboardShortcut("a", handleApprove, {
+    enabled: showModal,
+    ...(bulkApprovePayload?.keyboardShortcutOptions ?? { modal: true }),
+  });
+
+  const groupLabel =
+    partners.length === 1 ? "Assign to group" : "Assign all to group";
 
   return (
     <Modal
-      showModal={showBulkApprovePartnersModal}
-      setShowModal={setShowBulkApprovePartnersModal}
+      showModal={showModal}
+      setShowModal={(open) => {
+        if (!open) setBulkApprovePayload(null);
+      }}
     >
       <div className="space-y-1 border-b border-neutral-200 p-4 sm:p-6">
         <h3 className="text-lg font-semibold leading-none">
@@ -78,28 +150,47 @@ function BulkApprovePartnersModal({
       </div>
 
       <div className="space-y-6 bg-neutral-50 p-4 sm:p-6">
-        <div className="flex items-center gap-3 rounded-lg border border-neutral-200 bg-neutral-100 p-3">
-          <div className="flex items-center">
-            {partners.slice(0, 3).map((partner, index) => (
+        {partners.length === 1 ? (
+          <div className="rounded-lg border border-neutral-200 bg-neutral-100 p-3">
+            <div className="flex items-center gap-4">
               <PartnerAvatar
-                key={partner.id}
-                partner={partner}
-                className={cn(
-                  "inline-block size-7 border-2 border-neutral-100",
-                  index > 0 && "-ml-2.5",
-                )}
+                partner={partners[0]}
+                className="size-10 bg-white"
               />
-            ))}
+              <div className="flex min-w-0 flex-col">
+                <h4 className="truncate text-sm font-medium text-neutral-900">
+                  {partners[0].name}
+                </h4>
+                <p className="truncate text-xs text-neutral-500">
+                  {partners[0].email}
+                </p>
+              </div>
+            </div>
           </div>
-          <span className="text-base font-semibold text-neutral-900">
-            {partners.length} {pluralize("partner", partners.length)} selected
-          </span>
-        </div>
+        ) : (
+          <div className="flex items-center gap-3 rounded-lg border border-neutral-200 bg-neutral-100 p-3">
+            <div className="flex items-center">
+              {partners.slice(0, 3).map((partner, index) => (
+                <PartnerAvatar
+                  key={partner.id}
+                  partner={partner}
+                  className={cn(
+                    "inline-block size-7 border-2 border-neutral-100",
+                    index > 0 && "-ml-2.5",
+                  )}
+                />
+              ))}
+            </div>
+            <span className="text-base font-semibold text-neutral-900">
+              {partners.length} {pluralize("partner", partners.length)} selected
+            </span>
+          </div>
+        )}
 
         <div className="grid grid-cols-1 gap-6">
           <div>
             <label className="block text-sm font-medium text-neutral-900">
-              Assign all to group{" "}
+              {groupLabel}{" "}
             </label>
 
             <div className="relative mt-2 rounded-md shadow-sm">
@@ -114,46 +205,47 @@ function BulkApprovePartnersModal({
 
       <div className="flex items-center justify-end gap-2 border-t border-neutral-200 bg-neutral-50 px-4 py-5 sm:px-6">
         <Button
-          onClick={() => setShowBulkApprovePartnersModal(false)}
+          onClick={() => setBulkApprovePayload(null)}
           variant="secondary"
           text="Cancel"
           className="h-8 w-fit px-3"
+          disabled={isPending}
         />
         <Button
-          onClick={handleBulkApprove}
+          onClick={handleApprove}
           autoFocus
           loading={isPending}
           text="Approve"
           className="h-8 w-fit px-3"
+          shortcut="A"
         />
       </div>
     </Modal>
   );
 }
 
-export function useBulkApprovePartnersModal({
-  partners,
-}: {
-  partners: EnrolledPartnerProps[];
-}) {
-  const [showBulkApprovePartnersModal, setShowBulkApprovePartnersModal] =
-    useState(false);
+export function useBulkApprovePartnersModal() {
+  const [bulkApprovePayload, setBulkApprovePayload] =
+    useState<BulkApprovePartnersPayload | null>(null);
+
+  const openBulkApprove = useCallback((payload: BulkApprovePartnersPayload) => {
+    setBulkApprovePayload(payload);
+  }, []);
 
   const BulkApprovePartnersModalCallback = useCallback(() => {
     return (
       <BulkApprovePartnersModal
-        showBulkApprovePartnersModal={showBulkApprovePartnersModal}
-        setShowBulkApprovePartnersModal={setShowBulkApprovePartnersModal}
-        partners={partners}
+        bulkApprovePayload={bulkApprovePayload}
+        setBulkApprovePayload={setBulkApprovePayload}
       />
     );
-  }, [showBulkApprovePartnersModal, setShowBulkApprovePartnersModal, partners]);
+  }, [bulkApprovePayload]);
 
   return useMemo(
     () => ({
-      setShowBulkApprovePartnersModal,
+      openBulkApprove,
       BulkApprovePartnersModal: BulkApprovePartnersModalCallback,
     }),
-    [setShowBulkApprovePartnersModal, BulkApprovePartnersModalCallback],
+    [openBulkApprove, BulkApprovePartnersModalCallback],
   );
 }
diff --git a/apps/web/ui/partners/partner-application-sheet.tsx b/apps/web/ui/partners/partner-application-sheet.tsx
index 9c78066b389..7abdc357b53 100644
--- a/apps/web/ui/partners/partner-application-sheet.tsx
+++ b/apps/web/ui/partners/partner-application-sheet.tsx
@@ -1,7 +1,7 @@
 import { mutatePrefix } from "@/lib/swr/mutate";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { EnrolledPartnerProps } from "@/lib/types";
-import { useApprovePartnerApplicationModal } from "@/ui/modals/approve-partner-application-modal";
+import type { BulkApprovePartnersPayload } from "@/ui/modals/bulk-approve-partners-modal";
 import { useRejectPartnerApplicationModal } from "@/ui/modals/reject-partner-application-modal";
 import { X } from "@/ui/shared/icons";
 import {
@@ -14,7 +14,13 @@ import {
   useRouterStuff,
 } from "@dub/ui";
 import Link from "next/link";
-import { Dispatch, SetStateAction, useEffect, useState } from "react";
+import {
+  Dispatch,
+  SetStateAction,
+  useCallback,
+  useEffect,
+  useState,
+} from "react";
 import { PartnerAbout } from "./partner-about";
 import { PartnerApplicationDetails } from "./partner-application-details";
 import { PartnerComments } from "./partner-comments";
@@ -26,6 +32,7 @@ type PartnerApplicationSheetProps = {
   onNext?: () => void;
   onPrevious?: () => void;
   setIsOpen: Dispatch<SetStateAction<boolean>>;
+  onOpenBulkApprove: (payload: BulkApprovePartnersPayload) => void;
 };
 
 function PartnerApplicationSheetContent({
@@ -33,6 +40,7 @@ function PartnerApplicationSheetContent({
   onPrevious,
   onNext,
   setIsOpen,
+  onOpenBulkApprove,
 }: PartnerApplicationSheetProps) {
   const { slug: workspaceSlug } = useWorkspace();
   const [currentTabId, setCurrentTabId] = useState<string>("about");
@@ -66,7 +74,7 @@ function PartnerApplicationSheetContent({
   // Reset selection when navigating between partners
   useEffect(() => {
     setSelectedGroupId(partner.groupId ?? null);
-  }, [partner.groupId]);
+  }, [partner.id, partner.groupId]);
 
   return (
     <div className="flex size-full flex-col">
@@ -155,6 +163,7 @@ function PartnerApplicationSheetContent({
             }
             setIsOpen={setIsOpen}
             onNext={onNext}
+            onOpenBulkApprove={onOpenBulkApprove}
           />
         </div>
       )}
@@ -218,52 +227,49 @@ function PartnerApproval({
   groupId,
   setIsOpen,
   onNext,
+  onOpenBulkApprove,
 }: {
   partner: EnrolledPartnerProps;
   groupId?: string | null;
   setIsOpen: Dispatch<SetStateAction<boolean>>;
   onNext?: () => void;
+  onOpenBulkApprove: (payload: BulkApprovePartnersPayload) => void;
 }) {
-  const {
-    ApprovePartnerApplicationModal,
-    setShowApprovePartnerApplicationModal,
-  } = useApprovePartnerApplicationModal({
-    partner,
-    groupId,
-    onConfirm: async () => {
-      onNext ? onNext() : setIsOpen(false);
-      await mutatePrefix("/api/partners");
-    },
-    confirmShortcutOptions: { sheet: true, modal: true },
-  });
+  const openApproveModal = useCallback(() => {
+    onOpenBulkApprove({
+      partners: [partner],
+      initialGroupId: groupId,
+      onApproveSuccess: async () => {
+        onNext ? onNext() : setIsOpen(false);
+      },
+      keyboardShortcutOptions: { modal: true, sheet: true },
+    });
+  }, [partner, groupId, onNext, setIsOpen, onOpenBulkApprove]);
 
-  useKeyboardShortcut("a", () => setShowApprovePartnerApplicationModal(true), {
+  useKeyboardShortcut("a", openApproveModal, {
     sheet: true,
   });
 
   return (
-    <>
-      {ApprovePartnerApplicationModal}
-      <div className="flex justify-end gap-2">
-        {partner.status !== "rejected" && (
-          <div className="flex-shrink-0">
-            <PartnerRejectButton
-              partner={partner}
-              setIsOpen={setIsOpen}
-              onNext={onNext}
-            />
-          </div>
-        )}
-        <Button
-          type="button"
-          variant="primary"
-          text="Approve"
-          shortcut="A"
-          onClick={() => setShowApprovePartnerApplicationModal(true)}
-          className="w-fit shrink-0"
-        />
-      </div>
-    </>
+    <div className="flex justify-end gap-2">
+      {partner.status !== "rejected" && (
+        <div className="flex-shrink-0">
+          <PartnerRejectButton
+            partner={partner}
+            setIsOpen={setIsOpen}
+            onNext={onNext}
+          />
+        </div>
+      )}
+      <Button
+        type="button"
+        variant="primary"
+        text="Approve"
+        shortcut="A"
+        onClick={openApproveModal}
+        className="w-fit shrink-0"
+      />
+    </div>
   );
 }