diff --git a/DuckDuckGo/SecureVault/View/PasswordManagementPopover.swift b/DuckDuckGo/SecureVault/View/PasswordManagementPopover.swift
index 7e439c1e25..333a0caf6a 100644
--- a/DuckDuckGo/SecureVault/View/PasswordManagementPopover.swift
+++ b/DuckDuckGo/SecureVault/View/PasswordManagementPopover.swift
@@ -71,4 +71,8 @@ extension PasswordManagementPopover: NSPopoverDelegate {
         }
     }
 
+    @MainActor func popoverShouldClose(_ popover: NSPopover) -> Bool {
+        !viewController.isEditing
+    }
+
 }