diff --git a/keepassxc-browser/background/page.js b/keepassxc-browser/background/page.js
index 956b2a2..4020a1b 100755
--- a/keepassxc-browser/background/page.js
+++ b/keepassxc-browser/background/page.js
@@ -518,7 +518,7 @@ page.getBaseDomainFromUrl = async function(hostname, url) {
 
 const createContextMenuItem = function({ action, args, ...options }) {
     return browser.contextMenus.create({
-        contexts: menuContexts,
+        contexts: page.menuContexts,
         id: action,
         ...options
     });
diff --git a/keepassxc-browser/popups/popup_functions.js b/keepassxc-browser/popups/popup_functions.js
index 0228ae2..30acbb3 100644
--- a/keepassxc-browser/popups/popup_functions.js
+++ b/keepassxc-browser/popups/popup_functions.js
@@ -16,7 +16,7 @@ async function initSettings() {
     });
 
     const customLoginFieldsButton = document.body.querySelector('#settings #choose-custom-login-fields-button');
-    const isFirefox = browser.runtime.sendMessage({ action: 'is_firefox' });
+    const isFirefox = await browser.runtime.sendMessage({ action: 'is_firefox' });
     if (isFirefox) {
         customLoginFieldsButton.id = 'choose-custom-login-fields-button-moz';
     }