diff --git a/keepassxc-browser/background/event.js b/keepassxc-browser/background/event.js
index e4fe61e..569c06c 100755
--- a/keepassxc-browser/background/event.js
+++ b/keepassxc-browser/background/event.js
@@ -217,7 +217,17 @@ kpxcEvent.onRemoveCredentialsFromTabInformation = function(callback, tab) {
 };
 
 kpxcEvent.onSetRememberPopup = function(callback, tab, username, password, url, usernameExists, credentialsList) {
-    browserAction.setRememberPopup(tab.id, username, password, url, usernameExists, credentialsList);
+    keepass.testAssociation((response) => {
+        if (response) {
+            keepass.isConfigured().then((configured) => {
+                if (configured) {
+                    browserAction.setRememberPopup(tab.id, username, password, url, usernameExists, credentialsList);
+                }
+            }).catch((e) => {
+                console.log(e);
+            });
+        }
+    }, tab);
 };
 
 kpxcEvent.onLoginPopup = function(callback, tab, logins) {