diff --git a/core/messenger.js b/core/messenger.js
index f8df2283..b4eeac10 100644
--- a/core/messenger.js
+++ b/core/messenger.js
@@ -49,9 +49,9 @@ messenger._handleMessageReceived = function (message, sender, sendResponse) {
                 'code': `window.addEventListener('load', () => {
                     document.getElementById('domain').value = '${message.url}';
                 });`,
-                'runAt': 'document_start'
+                'runAt': 'document_idle'
             });
-            break;
+            return MessageResponse.SYNCHRONOUS;
 
         case 'domain:fetch-is-allowlisted':
             sendResponse({'value': Boolean(helpers.checkAllowlisted(value))});
diff --git a/modules/internal/helpers.js b/modules/internal/helpers.js
index 1317d568..84f4f7d1 100644
--- a/modules/internal/helpers.js
+++ b/modules/internal/helpers.js
@@ -204,7 +204,7 @@ helpers.determineActiveTab = function () {
             } else {
                 opt = {'active': true};
 
-                chrome.tabs.query(opt, function (tabs) {
+                chrome.tabs.query(opt, function () {
                     resolve(tabs[0]);
                 });
             }
diff --git a/modules/internal/targets.js b/modules/internal/targets.js
index b6033e7f..b7891a15 100644
--- a/modules/internal/targets.js
+++ b/modules/internal/targets.js
@@ -146,8 +146,6 @@ targets.setLastVersion = function (type, version) {
         return '0.1.1';
     } else if (type.startsWith('/angular-ui-select/0.')) {
         return '0.20.0';
-    } else if (type.startsWith('/angular-sanitize/1.')) {
-        return '1.7.9';
     } else if (type.startsWith('/angucomplete-alt/3.')) {
         return '3.0.0';
     } else if (type.startsWith('/animate.css/3.')) {
diff --git a/pages/popup/popup.js b/pages/popup/popup.js
index 07b563bf..3ec249fd 100644
--- a/pages/popup/popup.js
+++ b/pages/popup/popup.js
@@ -395,15 +395,13 @@ popup._filterDuplicates = function (array, key) {
      * Ignore empty values of the 'key'
      *
      */
-    let filtered = array
+    return array
         .map((e) => e[key])
         .map(function (value, index, newArray) {
             return value !== '' ? newArray.indexOf(value) === index && index : index;
         })
         .filter((e) => array[e])
         .map((e) => array[e]);
-
-    return filtered;
 };
 
 popup._renderLocaleNotice = function () {
@@ -445,10 +443,6 @@ popup._onTestingUtilityLinkClicked = function (event) {
             popup._injectDomain(tab.id);
         });
     }
-
-    if (event.button === 0) {
-        window.close();
-    }
 };
 
 popup._onDonationButtonClicked = function () {
@@ -510,6 +504,9 @@ popup._injectDomain = function (tabId) {
     };
 
     chrome.runtime.sendMessage(message);
+    setTimeout(function () {
+        popup._close();
+    }, 200);
 };
 
 popup._onOptionsButtonClicked = function () {
diff --git a/pages/updates/updates.js b/pages/updates/updates.js
index 6cc99257..3a7a123f 100644
--- a/pages/updates/updates.js
+++ b/pages/updates/updates.js
@@ -54,8 +54,8 @@ updates._onDocumentLoaded = function () {
         ['copyRuleSet']: document.getElementById('button-copy-rule-set'),
     };
 
-    for (let i = 0; i < updateElements.ruleSets.length; i++) {
-        updateElements.ruleSets[i].addEventListener('change', ruleGenerator.openRuleSet);
+    for (let ruleSets of updateElements.ruleSets) {
+        ruleSets.addEventListener('change', ruleGenerator.openRuleSet);
     }
 
     updateElements.copyRuleSet.addEventListener('click', ruleGenerator.copyRuleSet);