diff --git a/site/src/components/CopyButton/CopyButton.tsx b/site/src/components/CopyButton/CopyButton.tsx
index c00b9360e4..ab1b8d0dc6 100644
--- a/site/src/components/CopyButton/CopyButton.tsx
+++ b/site/src/components/CopyButton/CopyButton.tsx
@@ -22,7 +22,7 @@ export const CopyButton: FC<CopyButtonProps> = ({
 	const { showCopiedSuccess, copyToClipboard } = useClipboard();
 
 	return (
-		<TooltipProvider>
+		<TooltipProvider delayDuration={100}>
 			<Tooltip>
 				<TooltipTrigger asChild>
 					<Button
diff --git a/site/src/modules/dashboard/Navbar/UserDropdown/UserDropdown.tsx b/site/src/modules/dashboard/Navbar/UserDropdown/UserDropdown.tsx
index 4c796ee436..662a661e40 100644
--- a/site/src/modules/dashboard/Navbar/UserDropdown/UserDropdown.tsx
+++ b/site/src/modules/dashboard/Navbar/UserDropdown/UserDropdown.tsx
@@ -35,6 +35,7 @@ export const UserDropdown: FC<UserDropdownProps> = ({
 			<PopoverContent
 				align="end"
 				className="min-w-auto w-[260px] bg-surface-secondary border-surface-quaternary"
+				onOpenAutoFocus={(e) => e.preventDefault()}
 			>
 				<UserDropdownContent
 					user={user}