diff --git a/src/js/popup.js b/src/js/popup.js
index 0c1fe11..f9b5efb 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -506,8 +506,8 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
       Logic.showPanel(P_CONTAINER_EDIT, { name: Logic.generateIdentityName() });
     });
 
-    Logic.addEnterHandler(document.querySelector("#edit-containers-link"), () => {
-      if (!document.querySelector("#edit-containers").classList.contains("disable-edit-containers")){
+    Logic.addEnterHandler(document.querySelector("#edit-containers-link"), (e) => {
+      if (!e.target.classList.contains("disable-edit-containers")){
         Logic.showPanel(P_CONTAINERS_EDIT);
       }
     });
@@ -690,7 +690,7 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
       document.removeEventListener("focus", focusHandler);
     });
     /*  If no container is present disable the Edit Containers button */
-    const editContainer = document.querySelector("#edit-containers");
+    const editContainer = document.querySelector("#edit-containers-link");
     if (Logic.identities().length === 0) {
       editContainer.classList.add("disable-edit-containers");
     } else {
diff --git a/src/popup.html b/src/popup.html
index c342edd..a28dd32 100644
--- a/src/popup.html
+++ b/src/popup.html
@@ -116,7 +116,7 @@
       </table>
     </div>
     <div class="panel-footer edit-identities">
-      <div class="edit-containers-text panel-footer-secondary" id="edit-containers">
+      <div class="edit-containers-text panel-footer-secondary">
         <a href="#" tabindex="0" id="edit-containers-link">Edit Containers</a>
       </div>
       <a href="#" tabindex="0" class="add-container-link pop-button" id="container-add-link" title="Create new container">