diff --git a/keepassxc-browser/background/keepass.js b/keepassxc-browser/background/keepass.js
index e8fe811..3bb6478 100755
--- a/keepassxc-browser/background/keepass.js
+++ b/keepassxc-browser/background/keepass.js
@@ -1041,7 +1041,9 @@ keepass.reconnect = function(callback, tab) {
 };
 
 keepass.updatePopup = function(iconType) {
-    const data = page.tabs[page.currentTabId].stack[page.tabs[page.currentTabId].stack.length - 1];
-    data.iconType = iconType;
-    browserAction.show(null, {'id': page.currentTabId});
+    if (page && page.tabs.length > 0) {
+        const data = page.tabs[page.currentTabId].stack[page.tabs[page.currentTabId].stack.length - 1];
+        data.iconType = iconType;
+        browserAction.show(null, {'id': page.currentTabId});
+    }
 };