diff --git a/package.json b/package.json
index b72d3d5c..eb31d53d 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "addons-linter": "^1.3.2",
     "ajv": "^6.6.2",
     "chai": "^4.1.2",
-    "eslint": "^3.17.1",
+    "eslint": "^6.6.0",
     "eslint-plugin-no-unsanitized": "^2.0.0",
     "eslint-plugin-promise": "^3.4.0",
     "htmllint-cli": "0.0.7",
diff --git a/src/js/background/messageHandler.js b/src/js/background/messageHandler.js
index fa951813..9578e6e2 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/popup.js b/src/js/popup.js
index 433db3c2..64dca459 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") {