diff --git a/components/email/recipient-popover.tsx b/components/email/recipient-popover.tsx
index ab66ea67..007e8b12 100644
--- a/components/email/recipient-popover.tsx
+++ b/components/email/recipient-popover.tsx
@@ -39,7 +39,11 @@ export function RecipientPopover({ name, email, displayLabel, onViewContact, cla
   const phones = contact?.phones ? Object.values(contact.phones) : [];
   const orgs = contact?.organizations ? Object.values(contact.organizations) : [];
 
-  const handleOpen = () => {
+  const handleToggle = () => {
+    if (isOpen) {
+      handleClose();
+      return;
+    }
     if (!triggerRef.current) return;
     const rect = triggerRef.current.getBoundingClientRect();
     const popoverWidth = 300;
@@ -125,7 +129,7 @@ export function RecipientPopover({ name, email, displayLabel, onViewContact, cla
     <>
       <button
         ref={triggerRef}
-        onClick={handleOpen}
+        onClick={handleToggle}
         className={cn(
           "text-foreground hover:text-primary hover:underline cursor-pointer transition-colors min-w-0 break-words",
           className