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..19dc1d391c 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,6 +26,7 @@ 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
@@ -36,8 +37,15 @@ 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/RoomDetailRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt
index 0ea1191fba..91409582d9 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt
@@ -56,10 +56,8 @@ class RoomDetailRobot {
         // Menu
         openMenu()
         pressBack()
-        /* TODO something has changed in the menu :/
         clickMenu(R.id.voice_call)
         pressBack()
-         */
         clickMenu(R.id.video_call)
         pressBack()
     }
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()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
index 0c56d7e7eb..e01c5ba3b7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
@@ -87,7 +87,12 @@ data class RoomDetailViewState(
             rootThreadEventId = args.threadTimelineArgs?.rootThreadEventId
     )
 
-    fun isCallOptionAvailable() = asyncRoomSummary.invoke()?.isDirect ?: true
+    fun isCallOptionAvailable(): Boolean {
+        return asyncRoomSummary.invoke()?.isDirect ?: true ||
+                // When there is only one member, a warning will be displayed when the user
+                // clicks on the menu item to start a call
+                asyncRoomSummary.invoke()?.joinedMembersCount == 1
+    }
 
     fun isSearchAvailable() = asyncRoomSummary()?.isEncrypted == false