Improve active tab determination logic

modules/internal/helpers.js

@@ -149,6 +149,28 @@ helpers.generateRandomHexString = function (length) {
     return randomHexString;
 };
 
+helpers.determineActiveTab = function () {
+
+    return new Promise((resolve) => {
+
+        let queryParameters = {'active': true, 'currentWindow': true};
+
+        chrome.tabs.query(queryParameters, function (tabs) {
+
+            if (tabs[0]) {
+                resolve(tabs[0]);
+            } else {
+
+                queryParameters = {'active': true};
+
+                chrome.tabs.query(queryParameters, function (tabs) {
+                    resolve(tabs[0]);
+                });
+            }
+        });
+    });
+};
+
 helpers.determineCdnName = function (domainName) {
 
     switch (domainName) {

pages/popup/popup.js

@@ -209,10 +209,10 @@ popup._determineTargetTab = function () {
 
     return new Promise((resolve) => {
 
-        chrome.tabs.query({'active': true, 'currentWindow': true}, function (tabs) {
+        helpers.determineActiveTab().then((activeTab) => {
 
-            popup._targetTab = tabs[0];
-            popup._domain = helpers.extractDomainFromUrl(tabs[0].url, true);
+            popup._targetTab = activeTab;
+            popup._domain = helpers.extractDomainFromUrl(activeTab.url, true);
 
             resolve();
         });