diff --git a/webextension/css/popup.css b/webextension/css/popup.css
index a0f2c52..e9c7699 100644
--- a/webextension/css/popup.css
+++ b/webextension/css/popup.css
@@ -597,7 +597,8 @@ span ~ .panel-header-text {
 }
 
 .container-panel-row:hover .clickable .usercontext-icon,
-.container-panel-row:focus .clickable .usercontext-icon {
+.container-panel-row:focus .clickable .usercontext-icon,
+.container-panel-row .clickable:focus .usercontext-icon {
   background-image: url('/img/container-newtab.svg');
   fill: #979797;
   filter: url('/img/filters.svg#fill');
diff --git a/webextension/js/popup.js b/webextension/js/popup.js
index addd036..23b49ee 100644
--- a/webextension/js/popup.js
+++ b/webextension/js/popup.js
@@ -398,13 +398,13 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
       function next() {
         const nextElement = element.nextElementSibling;
         if (nextElement) {
-          nextElement.focus();
+          nextElement.querySelector("td[tabindex=0]").focus();
         }
       }
       function previous() {
         const previousElement = element.previousElementSibling;
         if (previousElement) {
-          previousElement.focus();
+          previousElement.querySelector("td[tabindex=0]").focus();
         }
       }
       switch (e.keyCode) {
@@ -487,10 +487,9 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
 
       tr.classList.add("container-panel-row");
 
-      tr.setAttribute("tabindex", "0");
-
       context.classList.add("userContext-wrapper", "open-newtab", "clickable");
       manage.classList.add("show-tabs", "pop-button");
+      context.setAttribute("tabindex", "0");
       context.innerHTML = escaped`
         <div class="userContext-icon-wrapper open-newtab">
           <div class="usercontext-icon"
@@ -539,7 +538,7 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
        however it allows us to have a tabindex before the first selected item
      */
     const focusHandler = () => {
-      list.querySelector("tr").focus();
+      list.querySelector("tr .clickable").focus();
       document.removeEventListener("focus", focusHandler);
     };
     document.addEventListener("focus", focusHandler);