diff --git a/apps/web/src/app/accounts/[id]/page.tsx b/apps/web/src/app/accounts/[id]/page.tsx
index 963b293..7f211ef 100644
--- a/apps/web/src/app/accounts/[id]/page.tsx
+++ b/apps/web/src/app/accounts/[id]/page.tsx
@@ -74,33 +74,37 @@ export default async function AccountDetailPage({ params }: AccountDetailPagePro
       </div>
 
       <div className="flex flex-col gap-3">
-        {/* Pair / Re-pair — entire card is the submit button */}
+        {/* Pair / Re-pair — keep the form-submit semantics. The whole
+            card surface is still the click target via a transparent
+            overlay submit button positioned over the card; the visible
+            Card stays a <div>, so we never nest a <div> inside a
+            <button> (invalid HTML → SSR hydration mismatch). */}
         {account.status !== "connected" && (
-          <form action={pairAccountAction} className="contents">
+          <form action={pairAccountAction} className="relative">
             <input type="hidden" name="accountId" value={account.id} />
+            <Card className="transition-all hover:shadow-md hover:ring-primary/30 cursor-pointer">
+              <CardContent className="flex items-center justify-between gap-4 py-4">
+                <div className="flex items-center gap-3">
+                  <div className="flex size-9 items-center justify-center rounded-lg bg-emerald-500/10">
+                    <PowerIcon className="size-4 text-emerald-600 dark:text-emerald-400" />
+                  </div>
+                  <div>
+                    <p className="text-sm font-medium">
+                      {account.status === "unpaired" ? "Pair WhatsApp" : "Re-pair WhatsApp"}
+                    </p>
+                    <p className="text-xs text-muted-foreground">
+                      Show a QR code so this account can connect to WhatsApp
+                    </p>
+                  </div>
+                </div>
+                <ChevronRightIcon className="size-4 text-muted-foreground/60" />
+              </CardContent>
+            </Card>
             <button
               type="submit"
-              className="block w-full text-left rounded-xl focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
-            >
-              <Card className="transition-all hover:shadow-md hover:ring-primary/30 cursor-pointer">
-                <CardContent className="flex items-center justify-between gap-4 py-4">
-                  <div className="flex items-center gap-3">
-                    <div className="flex size-9 items-center justify-center rounded-lg bg-emerald-500/10">
-                      <PowerIcon className="size-4 text-emerald-600 dark:text-emerald-400" />
-                    </div>
-                    <div>
-                      <p className="text-sm font-medium">
-                        {account.status === "unpaired" ? "Pair WhatsApp" : "Re-pair WhatsApp"}
-                      </p>
-                      <p className="text-xs text-muted-foreground">
-                        Show a QR code so this account can connect to WhatsApp
-                      </p>
-                    </div>
-                  </div>
-                  <ChevronRightIcon className="size-4 text-muted-foreground/60" />
-                </CardContent>
-              </Card>
-            </button>
+              aria-label={account.status === "unpaired" ? "Pair WhatsApp" : "Re-pair WhatsApp"}
+              className="absolute inset-0 w-full rounded-xl bg-transparent focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
+            />
           </form>
         )}
 
@@ -130,27 +134,27 @@ export default async function AccountDetailPage({ params }: AccountDetailPagePro
             {/* Unpair — entire card opens the confirm dialog */}
             <Dialog>
               <DialogTrigger asChild>
-                <button
-                  type="button"
-                  className="block w-full text-left rounded-xl focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
+                <Card
+                  role="button"
+                  tabIndex={0}
+                  aria-label="Unpair WhatsApp"
+                  className="transition-all hover:shadow-md hover:ring-amber-500/30 cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
                 >
-                  <Card className="transition-all hover:shadow-md hover:ring-amber-500/30 cursor-pointer">
-                    <CardContent className="flex items-center justify-between gap-4 py-4">
-                      <div className="flex items-center gap-3">
-                        <div className="flex size-9 items-center justify-center rounded-lg bg-amber-500/10">
-                          <PowerOffIcon className="size-4 text-amber-600 dark:text-amber-400" />
-                        </div>
-                        <div>
-                          <p className="text-sm font-medium">Unpair</p>
-                          <p className="text-xs text-muted-foreground">
-                            Disconnect from WhatsApp; keep the account so you can re-pair later
-                          </p>
-                        </div>
+                  <CardContent className="flex items-center justify-between gap-4 py-4">
+                    <div className="flex items-center gap-3">
+                      <div className="flex size-9 items-center justify-center rounded-lg bg-amber-500/10">
+                        <PowerOffIcon className="size-4 text-amber-600 dark:text-amber-400" />
                       </div>
-                      <ChevronRightIcon className="size-4 text-muted-foreground/60" />
-                    </CardContent>
-                  </Card>
-                </button>
+                      <div>
+                        <p className="text-sm font-medium">Unpair</p>
+                        <p className="text-xs text-muted-foreground">
+                          Disconnect from WhatsApp; keep the account so you can re-pair later
+                        </p>
+                      </div>
+                    </div>
+                    <ChevronRightIcon className="size-4 text-muted-foreground/60" />
+                  </CardContent>
+                </Card>
               </DialogTrigger>
               <DialogContent>
                 <DialogHeader>
@@ -178,27 +182,27 @@ export default async function AccountDetailPage({ params }: AccountDetailPagePro
         {/* Delete — entire card opens the confirm dialog */}
         <Dialog>
           <DialogTrigger asChild>
-            <button
-              type="button"
-              className="block w-full text-left rounded-xl focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
+            <Card
+              role="button"
+              tabIndex={0}
+              aria-label="Delete account"
+              className="transition-all hover:shadow-md hover:ring-destructive/30 cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-destructive focus-visible:ring-offset-2"
             >
-              <Card className="transition-all hover:shadow-md hover:ring-destructive/30 cursor-pointer">
-                <CardContent className="flex items-center justify-between gap-4 py-4">
-                  <div className="flex items-center gap-3">
-                    <div className="flex size-9 items-center justify-center rounded-lg bg-destructive/10">
-                      <Trash2Icon className="size-4 text-destructive" />
-                    </div>
-                    <div>
-                      <p className="text-sm font-medium text-destructive">Delete Account</p>
-                      <p className="text-xs text-muted-foreground">
-                        Remove the account and all its reminders, groups, and history
-                      </p>
-                    </div>
+              <CardContent className="flex items-center justify-between gap-4 py-4">
+                <div className="flex items-center gap-3">
+                  <div className="flex size-9 items-center justify-center rounded-lg bg-destructive/10">
+                    <Trash2Icon className="size-4 text-destructive" />
                   </div>
-                  <ChevronRightIcon className="size-4 text-muted-foreground/60" />
-                </CardContent>
-              </Card>
-            </button>
+                  <div>
+                    <p className="text-sm font-medium text-destructive">Delete Account</p>
+                    <p className="text-xs text-muted-foreground">
+                      Remove the account and all its reminders, groups, and history
+                    </p>
+                  </div>
+                </div>
+                <ChevronRightIcon className="size-4 text-muted-foreground/60" />
+              </CardContent>
+            </Card>
           </DialogTrigger>
           <DialogContent>
             <DialogHeader>
diff --git a/apps/web/src/components/accounts-list-view.test.tsx b/apps/web/src/components/accounts-list-view.test.tsx
index c1aac06..a3174f4 100644
--- a/apps/web/src/components/accounts-list-view.test.tsx
+++ b/apps/web/src/components/accounts-list-view.test.tsx
@@ -109,17 +109,20 @@ describe("AccountsListView", () => {
       expect(html).toMatch(/<strong>MyBiz<\/strong>/);
     });
 
-    it("delete card is a button with the destructive aria-label", () => {
+    it("delete card is a focusable trigger element with the destructive aria-label", () => {
       const html = renderToStaticMarkup(
         <AccountsListView
           accounts={[mkAccount({ label: "Sales" })]}
           deleteFormAction={noopAction}
         />,
       );
-      // Order of attributes in the rendered <button> isn't guaranteed, so
-      // assert each one exists and that they're on a button element.
-      expect(html).toMatch(/<button[^>]*\baria-label="Delete Sales"/);
-      expect(html).toMatch(/<button[^>]*\bdata-testid="account-delete-card"/);
+      // The trigger is a Card (rendered as <div>) acting as a button via
+      // role+tabIndex. Wrapping a <div> in a real <button> would be
+      // invalid HTML and trigger a hydration mismatch.
+      expect(html).toMatch(/role="button"/);
+      expect(html).toMatch(/tabIndex="0"|tabindex="0"/);
+      expect(html).toMatch(/aria-label="Delete Sales"/);
+      expect(html).toMatch(/data-testid="account-delete-card"/);
       // `Delete account` heading copy lives inside the card
       expect(html).toContain("Delete account");
     });
diff --git a/apps/web/src/components/accounts-list-view.tsx b/apps/web/src/components/accounts-list-view.tsx
index 9a744ff..952d993 100644
--- a/apps/web/src/components/accounts-list-view.tsx
+++ b/apps/web/src/components/accounts-list-view.tsx
@@ -106,29 +106,34 @@ export function AccountsListView({ accounts, deleteFormAction }: AccountsListVie
                 </Card>
               </Link>
 
-              {/* Dedicated Delete card — entire card is the dialog trigger. */}
+              {/* Dedicated Delete card — entire card is the dialog trigger.
+                  We avoid wrapping the Card (a <div>) in a <button> because
+                  div-inside-button is invalid HTML and the browser auto-
+                  closes the button, breaking SSR hydration. Radix's
+                  DialogTrigger asChild forwards the click handler to the
+                  Card element directly; role="button"+tabIndex makes it
+                  keyboard-focusable. */}
               <Dialog>
                 <DialogTrigger asChild>
-                  <button
-                    type="button"
+                  <Card
+                    role="button"
+                    tabIndex={0}
                     data-testid="account-delete-card"
                     aria-label={`Delete ${account.label}`}
-                    className="block w-full text-left rounded-xl focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-destructive focus-visible:ring-offset-2"
+                    className="transition-all hover:shadow-md hover:ring-destructive/30 cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-destructive focus-visible:ring-offset-2"
                   >
-                    <Card className="transition-all hover:shadow-md hover:ring-destructive/30 cursor-pointer">
-                      <CardContent className="flex items-center gap-3 py-3 px-4">
-                        <div className="flex size-8 shrink-0 items-center justify-center rounded-lg bg-destructive/10">
-                          <Trash2Icon className="size-4 text-destructive" />
-                        </div>
-                        <div className="min-w-0 flex-1">
-                          <p className="text-sm font-medium text-destructive">Delete account</p>
-                          <p className="text-xs text-muted-foreground truncate">
-                            Remove {account.label} and its reminders & groups
-                          </p>
-                        </div>
-                      </CardContent>
-                    </Card>
-                  </button>
+                    <CardContent className="flex items-center gap-3 py-3 px-4">
+                      <div className="flex size-8 shrink-0 items-center justify-center rounded-lg bg-destructive/10">
+                        <Trash2Icon className="size-4 text-destructive" />
+                      </div>
+                      <div className="min-w-0 flex-1">
+                        <p className="text-sm font-medium text-destructive">Delete account</p>
+                        <p className="text-xs text-muted-foreground truncate">
+                          Remove {account.label} and its reminders & groups
+                        </p>
+                      </div>
+                    </CardContent>
+                  </Card>
                 </DialogTrigger>
                 <DialogContent>
                   <DialogHeader>