diff --git a/tests/password_manager/test_auto_saved_generated_password_context_menu.py b/tests/password_manager/test_auto_saved_generated_password_context_menu.py
index c66c43740..5c78c3c37 100644
--- a/tests/password_manager/test_auto_saved_generated_password_context_menu.py
+++ b/tests/password_manager/test_auto_saved_generated_password_context_menu.py
@@ -1,3 +1,5 @@
+from time import sleep
+
 import pytest
 from selenium.webdriver import Firefox
 
@@ -23,6 +25,7 @@ def test_auto_saved_generated_password_context_menu(driver: Firefox):
     """
     C2248176 - Securely Generated Password is auto-saved when generated from password field context menu
     """
+
     # Instantiate objects
     context_menu = ContextMenu(driver)
     tabs = TabBar(driver)
@@ -37,14 +40,25 @@ def test_auto_saved_generated_password_context_menu(driver: Firefox):
     context_menu.click_and_hide_menu("context-menu-suggest-strong-password")
 
     # Select "Use a Securely Generated Password" in password field and check the "Update password" doorhanger
-    # is displayed
     with driver.context(driver.CONTEXT_CHROME):
         login_autofill.get_element("generated-securely-password").click()
+
+    # Wait for password field to actually get filled
+    login_autofill.expect(
+        lambda _: login_autofill.get_element("password-login-field").get_attribute(
+            "value"
+        )
+        != ""
+    )
+
+    # Verify the update doorhanger is displayed
+    with driver.context(driver.CONTEXT_CHROME):
+        sleep(3)
         nav.click_on("password-notification-key")
-        update_doorhanger = autofill_popup_panel.get_element(
-            "password-update-doorhanger"
+        autofill_popup_panel.expect(
+            lambda _: UPDATE_DOORHANGER_TEXT
+            in autofill_popup_panel.get_element("password-update-doorhanger").text
         )
-        assert update_doorhanger.text == UPDATE_DOORHANGER_TEXT
 
     # Navigate to about:logins page
     tabs.switch_to_new_tab()