From 358551feda5f8f0d22e31f775fdcfc65fe2ff8af Mon Sep 17 00:00:00 2001
From: Kendall Werts <kmwerts@gmail.com>
Date: Fri, 28 Feb 2020 09:23:14 -0600
Subject: [PATCH] Made selector for keyboard shortcuts more specific to fix
 #1666

Bumped version for release
---
 package.json      | 2 +-
 src/js/popup.js   | 4 ++--
 src/manifest.json | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 1bf6531..f226f31 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "testpilot-containers",
   "title": "Multi-Account Containers",
   "description": "Containers helps you keep all the parts of your online life contained in different tabs. Custom labels and color-coded tabs help keep different activities — like online shopping, travel planning, or checking work email — separate.",
-  "version": "6.2.2",
+  "version": "6.2.3",
   "author": "Andrea Marchesini, Luke Crouch and Jonathan Kingston",
   "bugs": {
     "url": "https://github.com/mozilla/multi-account-containers/issues"
diff --git a/src/js/popup.js b/src/js/popup.js
index 92f54b4..1349ffa 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -611,7 +611,7 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
     });
 
     document.addEventListener("keydown", (e) => {
-      const selectables = [...document.querySelectorAll("[tabindex='0'], [tabindex='-1']")];
+      const selectables = [...document.querySelectorAll(".open-newtab[tabindex='0']")];
       const element = document.activeElement;
       const index = selectables.indexOf(element) || 0;
       function next() {
@@ -652,7 +652,7 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
       default:
         if ((e.keyCode >= 49 && e.keyCode <= 57) &&
             Logic._currentPanel === "containersList") {
-          const element = selectables[e.keyCode - 48];
+          const element = selectables[e.keyCode - 49];
           if (element) {
             element.click();
           }
diff --git a/src/manifest.json b/src/manifest.json
index 4c1480f..a18a44c 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Firefox Multi-Account Containers",
-  "version": "6.2.2",
+  "version": "6.2.3",
   "incognito": "not_allowed",
   "description": "Multi-Account Containers helps you keep all the parts of your online life contained in different tabs. Custom labels and color-coded tabs help keep different activities — like online shopping, travel planning, or checking work email — separate.",
   "icons": {