diff --git a/keepassxc-browser/common/global_ui.js b/keepassxc-browser/common/global_ui.js
index 0d31b40..83ab058 100644
--- a/keepassxc-browser/common/global_ui.js
+++ b/keepassxc-browser/common/global_ui.js
@@ -16,13 +16,14 @@ const updateDefaultPasswordManager = async function() {
     }
 
     const passwordSavingEnabled = await browser.privacy.services.passwordSavingEnabled.get({});
-    if ((passwordSavingEnabled?.levelOfControl === 'controlled_by_this_extension'
-        || passwordSavingEnabled?.levelOfControl === 'controllable_by_this_extension')
-    ) {
+    if (passwordSavingEnabled?.levelOfControl === 'controllable_by_this_extension') {
         await browser.privacy.services.passwordSavingEnabled.set({
-            value: !passwordSavingEnabled.value,
+            value: false,
         });
+        return true;
+    } else if (passwordSavingEnabled?.levelOfControl === 'controlled_by_this_extension') {
+        await browser.privacy.services.passwordSavingEnabled.clear({});
     }
 
-    return passwordSavingEnabled.value;
+    return false;
 };