diff --git a/src/js/popup.js b/src/js/popup.js
index f01a5e3..c1417c6 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -931,7 +931,8 @@ Logic.registerPanel(P_CONTAINERS_EDIT, {
       tr.querySelector(".container-name").textContent = identity.name;
       tr.querySelector(".edit-container").setAttribute("title", `Edit ${identity.name} container`);
       tr.querySelector(".remove-container").setAttribute("title", `Remove ${identity.name} container`);
-
+      tr.querySelector(".edit-container").setAttribute("tabindex","0");
+      tr.querySelector(".remove-container").setAttribute("tabindex","0");
 
       Logic.addEnterHandler(tr, e => {
         if (e.target.matches(".edit-container-icon") || e.target.parentNode.matches(".edit-container-icon")) {
@@ -951,6 +952,7 @@ Logic.registerPanel(P_CONTAINERS_EDIT, {
   },
 });
 
+ 
 // Search the container tab entered in the search box
 
 const search = document.querySelector("#search-containers-link");