From bfc6f68978030ec45a4f0f8ce79c9828ac76e1d8 Mon Sep 17 00:00:00 2001
From: Jonathan Kingston <jonathan@jooped.co.uk>
Date: Wed, 14 Jun 2017 23:35:33 +0100
Subject: [PATCH 1/2] Fix for current tab showing the wrong window. Fixes #592

---
 webextension/js/popup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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];
     }

From 68c21624e28c55409b5ab936aeb9e6d8bcbb52a8 Mon Sep 17 00:00:00 2001
From: Jonathan Kingston <jonathan@jooped.co.uk>
Date: Thu, 15 Jun 2017 13:39:22 +0100
Subject: [PATCH 2/2] Reset context menu when assignment changes. Fixes #589

---
 webextension/background.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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) {