--- a/browser/components/aboutlogins/content/components/login-item.js
+++ b/browser/components/aboutlogins/content/components/login-item.js
@@ -83,16 +83,31 @@ export default class LoginItem extends H
     this._revealCheckbox.addEventListener("click", this);
     this._originInput.addEventListener("auxclick", this);
     window.addEventListener("AboutLoginsInitialLoginSelected", this);
     window.addEventListener("AboutLoginsLoadInitialFavicon", this);
     window.addEventListener("AboutLoginsLoginSelected", this);
     window.addEventListener("AboutLoginsShowBlankLogin", this);
   }
 
+  focus() {
+    if (!this._breachAlert.hidden) {
+      const breachAlertLink = this._breachAlert.querySelector(
+        ".breach-alert-link"
+      );
+      breachAlertLink.focus();
+      return;
+    }
+    if (!this._editButton.disabled) {
+      this._editButton.focus();
+      return;
+    }
+    this._deleteButton.focus();
+  }
+
   async render() {
     [this._errorMessage, this._breachAlert].forEach(el => {
       el.hidden = true;
     });
     if (this._breachesMap && this._breachesMap.has(this._login.guid)) {
       const breachDetails = this._breachesMap.get(this._login.guid);
       const breachAlertLink = this._breachAlert.querySelector(
         ".breach-alert-link"

--- a/browser/components/aboutlogins/content/components/login-list.js
+++ b/browser/components/aboutlogins/content/components/login-list.js
@@ -422,25 +422,17 @@ export default class LoginList extends H
       // CSS property set. Explicitly forward focus here until
       // this keyboard trap is fixed.
       if (event.shiftKey) {
         return;
       }
       let loginItem = document.querySelector("login-item");
       if (loginItem) {
         event.preventDefault();
-        let editButton = loginItem.shadowRoot.querySelector(".edit-button");
-        if (editButton && !editButton.disabled) {
-          editButton.focus();
-          return;
-        }
-        let deleteButton = loginItem.shadowRoot.querySelector(
-          "button.delete-button"
-        );
-        deleteButton.focus();
+        loginItem.focus();
       }
       return;
     } else if (this._list != this.shadowRoot.activeElement) {
       return;
     }
 
     let isLTR = document.dir == "ltr";
     let activeDescendantId = this._list.getAttribute("aria-activedescendant");