--- a/browser/components/aboutlogins/content/components/login-list.js
+++ b/browser/components/aboutlogins/content/components/login-list.js
@@ -337,16 +337,17 @@ export default class LoginList extends H
     if (this._breachesByLoginGUID.size === 0) {
       this.render();
       return;
     }
     const breachedSortOptionElement = this._sortSelect.namedItem("breached");
     breachedSortOptionElement.hidden = false;
     this._sortSelect.selectedIndex = breachedSortOptionElement.index;
     this._applySortAndScrollToTop();
+    this._selectFirstVisibleLogin();
   }
 
   /**
    * @param {Map} breachesByLoginGUID A Map of breaches by login GUIDs that
    *                                  should be added to the local cache of
    *                                  breaches.
    */
   updateBreaches(breachesByLoginGUID) {

--- a/browser/components/aboutlogins/tests/browser/browser_breachAlertDismissals.js
+++ b/browser/components/aboutlogins/tests/browser/browser_breachAlertDismissals.js
@@ -10,22 +10,25 @@ EXPECTED_BREACH = {
   DataClasses: ["Email addresses", "Usernames", "Passwords", "IP addresses"],
   _status: "synced",
   id: "047940fe-d2fd-4314-b636-b4a952ee0043",
   last_modified: "1541615610052",
   schema: "1541615609018",
 };
 
 add_task(async function setup() {
+  Services.prefs.setCharPref("signon.management.page.sort", "last-changed");
   TEST_LOGIN3 = await addLogin(TEST_LOGIN3);
+  TEST_LOGIN1 = await addLogin(TEST_LOGIN1);
   await BrowserTestUtils.openNewForegroundTab({
     gBrowser,
     url: "about:logins",
   });
   registerCleanupFunction(() => {
+    Services.prefs.clearUserPref("signon.management.page.sort");
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
     Services.logins.removeAllLogins();
   });
 });
 
 add_task(async function test_show_login() {
   let browser = gBrowser.selectedBrowser;
   await ContentTask.spawn(browser, null, async () => {