diff --git a/apps/web/src/dialogs/api-key/create.tsx b/apps/web/src/dialogs/api-key/create.tsx
index 439652ede..d8a9471f8 100644
--- a/apps/web/src/dialogs/api-key/create.tsx
+++ b/apps/web/src/dialogs/api-key/create.tsx
@@ -2,6 +2,7 @@ import type { DialogProps } from "../store";
 import { t } from "@lingui/core/macro";
 import { Trans } from "@lingui/react/macro";
 import { CopyIcon, PlusIcon } from "@phosphor-icons/react";
+import { useStore } from "@tanstack/react-form";
 import { useQueryClient } from "@tanstack/react-query";
 import { useState } from "react";
 import { toast } from "sonner";
@@ -83,6 +84,8 @@ const CreateApiKeyForm = ({ setApiKey }: CreateApiKeyFormProps) => {
 
 	useFormBlocker(form);
 
+	const isSubmitting = useStore(form.store, (state) => state.isSubmitting);
+
 	return (
 		<DialogContent>
 			<DialogHeader>
@@ -176,7 +179,7 @@ const CreateApiKeyForm = ({ setApiKey }: CreateApiKeyFormProps) => {
 				</form.Field>
 
 				<DialogFooter>
-					<Button type="submit">
+					<Button type="submit" disabled={isSubmitting}>
 						<Trans comment="Create API key dialog submit action">Create</Trans>
 					</Button>
 				</DialogFooter>
diff --git a/apps/web/src/dialogs/auth/enable-two-factor.tsx b/apps/web/src/dialogs/auth/enable-two-factor.tsx
index ccda50d04..23e13b247 100644
--- a/apps/web/src/dialogs/auth/enable-two-factor.tsx
+++ b/apps/web/src/dialogs/auth/enable-two-factor.tsx
@@ -254,6 +254,12 @@ export function EnableTwoFactorDialog(_: DialogProps<"auth.two-factor.enable">)
 									<div className="flex items-center gap-x-2">
 										<Input readOnly value={secret} className="font-mono text-sm" />
 										<Button size="icon" variant="ghost" type="button" onClick={handleCopySecret}>
+											<span className="sr-only">
+												{t({
+													comment: "Accessible label for the button that copies the two-factor secret key",
+													message: "Copy secret",
+												})}
+											</span>
 											<CopyIcon />
 										</Button>
 									</div>
diff --git a/apps/web/src/dialogs/resume/template/gallery.tsx b/apps/web/src/dialogs/resume/template/gallery.tsx
index fa3742858..4de51dddf 100644
--- a/apps/web/src/dialogs/resume/template/gallery.tsx
+++ b/apps/web/src/dialogs/resume/template/gallery.tsx
@@ -105,6 +105,7 @@ function TemplateCard({ id, data, metadata, isActive, onSelect }: TemplateCardPr
 				onClick={() => onSelect(id)}
 				className={cn(
 					"relative block aspect-page size-full cursor-pointer overflow-hidden rounded-md bg-popover outline-none",
+					"focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background",
 					isActive && "ring-2 ring-ring ring-offset-4 ring-offset-background",
 				)}
 			>