diff --git a/src/js/background/messageHandler.js b/src/js/background/messageHandler.js
index dcd8af6..46a7973 100644
--- a/src/js/background/messageHandler.js
+++ b/src/js/background/messageHandler.js
@@ -82,6 +82,7 @@ const messageHandler = {
         if (!extensionInfo.permissions.includes("contextualIdentities")) {
           throw new Error("Missing contextualIdentities permission");
         }
+        // eslint-disable-next-line require-atomic-updates
         externalExtensionAllowed[sender.id] = true;
       }
       let response;
diff --git a/src/js/options.js b/src/js/options.js
index 0eb1bb5..8473fb4 100644
--- a/src/js/options.js
+++ b/src/js/options.js
@@ -3,24 +3,24 @@ function requestPermissions() {
   const checkbox = document.querySelector("#bookmarksPermissions");
   if (checkbox.checked) {
     browser.permissions.request({permissions: ["bookmarks"]}).
-    then((response) => {
-      if (response) {
-        browser.runtime.sendMessage({ method: "resetBookmarksContext" });
-      } else {
-        checkbox.checked = false;
-      }
-    }).
-    catch((err) => {
-      return err.message;
-    });
+      then((response) => {
+        if (response) {
+          browser.runtime.sendMessage({ method: "resetBookmarksContext" });
+        } else {
+          checkbox.checked = false;
+        }
+      }).
+      catch((err) => {
+        return err.message;
+      });
   } else {
     browser.permissions.remove({permissions: ["bookmarks"]}).
-    then(() => {
-      browser.runtime.sendMessage({ method: "resetBookmarksContext" });
-    }).
-    catch((err) => {
-      return err.message;
-    });
+      then(() => {
+        browser.runtime.sendMessage({ method: "resetBookmarksContext" });
+      }).
+      catch((err) => {
+        return err.message;
+      });
   }
 }
 
diff --git a/src/js/popup.js b/src/js/popup.js
index 433db3c..64dca45 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -259,6 +259,7 @@ const Logic = {
 
   getPanelSelector(panel) {
     if (this._onboardingVariation === "securityOnboarding" &&
+    // eslint-disable-next-line no-prototype-builtins
       panel.hasOwnProperty("securityPanelSelector")) {
       return panel.securityPanelSelector;
     } else {
@@ -570,21 +571,21 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
         break;
       }
       case 39:
-        {
-          const showTabs = element.parentNode.querySelector(".show-tabs");
-          if(showTabs) {
-            showTabs.click();
-          }
-          break;
+      {
+        const showTabs = element.parentNode.querySelector(".show-tabs");
+        if(showTabs) {
+          showTabs.click();
         }
+        break;
+      }
       case 37:
-        {
-          const hideTabs = document.querySelector(".panel-back-arrow");
-          if(hideTabs) {
-            hideTabs.click();
-          }
-          break;
+      {
+        const hideTabs = document.querySelector(".panel-back-arrow");
+        if(hideTabs) {
+          hideTabs.click();
         }
+        break;
+      }
       default:
         if ((e.keyCode >= 49 && e.keyCode <= 57) &&
             Logic._currentPanel === "containersList") {