diff --git a/webextension/background.js b/webextension/background.js
index 7b43b3c..96fff29 100644
--- a/webextension/background.js
+++ b/webextension/background.js
@@ -163,7 +163,6 @@ const assignManager = {
         remove = true;
       }
       await this._setOrRemoveAssignment(tab.id, info.pageUrl, userContextId, remove);
-      this.calculateContextMenu(tab);
     }
   },
 
@@ -216,6 +215,8 @@ const assignManager = {
       event: `${actionName}-container-assignment`,
       userContextId: userContextId,
     });
+    const tab = await browser.tabs.get(tabId);
+    this.calculateContextMenu(tab);
   },
 
   async _getAssignment(tab) {
diff --git a/webextension/js/popup.js b/webextension/js/popup.js
index 23b49ee..2069560 100644
--- a/webextension/js/popup.js
+++ b/webextension/js/popup.js
@@ -134,7 +134,7 @@ const Logic = {
   },
 
   async currentTab() {
-    const activeTabs = await browser.tabs.query({active: true});
+    const activeTabs = await browser.tabs.query({active: true, windowId: browser.windows.WINDOW_ID_CURRENT});
     if (activeTabs.length > 0) {
       return activeTabs[0];
     }