diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAutofillRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAutofillRobot.kt
index 01b7d9789c..565abad663 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAutofillRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAutofillRobot.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.ui.robots
 
 import android.util.Log
+import androidx.test.espresso.Espresso.closeSoftKeyboard
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.RootMatchers
@@ -173,10 +174,10 @@ class SettingsSubMenuAutofillRobot {
     }
 
     fun verifyCountryOption(country: String) {
-        scrollToElementByText(getStringResource(R.string.addresses_country))
-        Log.i(TAG, "verifyCountryOption: Trying to click device back button")
-        mDevice.pressBack()
-        Log.i(TAG, "verifyCountryOption: Clicked device back button")
+        Log.i(TAG, "verifyCountryOption: Trying to perform \"Close soft keyboard\" action")
+        // Closing the keyboard to ensure full visibility of the "Add address" view
+        closeSoftKeyboard()
+        Log.i(TAG, "verifyCountryOption: Performed \"Close soft keyboard\" action")
         assertUIObjectExists(itemContainingText(country))
     }