diff --git a/src/js/popup.js b/src/js/popup.js
index 80986a2..39662f5 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -890,6 +890,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 => {