diff --git a/vector/src/androidTest/java/im/vector/app/espresso/tools/EspressoPreference.kt b/vector/src/androidTest/java/im/vector/app/espresso/tools/EspressoPreference.kt
index 178b9fb9f6..80cdeeccf1 100644
--- a/vector/src/androidTest/java/im/vector/app/espresso/tools/EspressoPreference.kt
+++ b/vector/src/androidTest/java/im/vector/app/espresso/tools/EspressoPreference.kt
@@ -26,18 +26,26 @@ import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItem
 import androidx.test.espresso.matcher.PreferenceMatchers.withKey
 import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
+import androidx.test.espresso.matcher.ViewMatchers.isFocusable
 import androidx.test.espresso.matcher.ViewMatchers.withClassName
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import im.vector.app.R
+import org.hamcrest.Matchers.`is`
 import org.hamcrest.Matchers.allOf
 import org.hamcrest.Matchers.instanceOf
-import org.hamcrest.Matchers.`is`
 
 fun clickOnPreference(@StringRes textResId: Int) {
     onView(withId(R.id.recycler_view))
-            .perform(actionOnItem<RecyclerView.ViewHolder>(
-                    hasDescendant(withText(textResId)), click()))
+            .perform(
+                    actionOnItem<RecyclerView.ViewHolder>(
+                            allOf(
+                                    hasDescendant(withText(textResId)),
+                                    // Avoid to click on the Preference Category
+                                    isFocusable()
+                            ), click()
+                    )
+            )
 }
 
 fun clickOnSwitchPreference(preferenceKey: String) {
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsSecurityRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsSecurityRobot.kt
index ef20d7764b..841c99e1b5 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsSecurityRobot.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsSecurityRobot.kt
@@ -18,7 +18,6 @@ package im.vector.app.ui.robot.settings
 
 import androidx.test.espresso.Espresso
 import im.vector.app.R
-import im.vector.app.clickOnAndGoBack
 import im.vector.app.espresso.tools.clickOnPreference
 
 class SettingsSecurityRobot {
@@ -38,10 +37,7 @@ class SettingsSecurityRobot {
         clickOnPreference(R.string.settings_opt_in_of_analytics)
         Espresso.pressBack()
 
-        ignoredUsers()
-    }
-
-    private fun ignoredUsers(block: () -> Unit = {}) {
-        clickOnAndGoBack(R.string.settings_ignored_users) { block() }
+        clickOnPreference(R.string.settings_ignored_users)
+        Espresso.pressBack()
     }
 }