diff --git a/keepassxc-browser/background/browserAction.js b/keepassxc-browser/background/browserAction.js
index 00e2c60..c61920d 100755
--- a/keepassxc-browser/background/browserAction.js
+++ b/keepassxc-browser/background/browserAction.js
@@ -30,6 +30,8 @@ browserAction.showDefault = async function(tab) {
 
     if (!response && !keepass.isKeePassXCAvailable) {
         popupData.iconType = 'cross';
+    } else if (!keepass.isAssociated() && !keepass.isDatabaseClosed) {
+        popupData.iconType = 'bang';
     } else if (keepass.isKeePassXCAvailable && keepass.isDatabaseClosed) {
         popupData.iconType = 'locked';
     }
diff --git a/keepassxc-browser/background/keepass.js b/keepassxc-browser/background/keepass.js
index ee15d32..7a02908 100755
--- a/keepassxc-browser/background/keepass.js
+++ b/keepassxc-browser/background/keepass.js
@@ -241,7 +241,7 @@ keepass.associate = async function(tab) {
             keepass.associated.value = true;
             keepass.associated.hash = response.hash || 0;
 
-            browserAction.show(tab);
+            browserAction.showDefault(tab);
             return AssociatedAction.NEW_ASSOCIATION;
         }
 
diff --git a/keepassxc-browser/options/options.js b/keepassxc-browser/options/options.js
index 1db8bd9..d65a6c8 100644
--- a/keepassxc-browser/options/options.js
+++ b/keepassxc-browser/options/options.js
@@ -380,6 +380,7 @@ options.initConnectedDatabases = function() {
         });
 
         hideEmptyMessageRow();
+        browser.runtime.sendMessage({ action: 'update_popup' });
     });
 
     const removeButtonClicked = function(e) {