diff --git a/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt
index 99303a8934..ad139309ac 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt
@@ -27,12 +27,14 @@ import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.extensions.showKeyboard
 
 @EpoxyModelClass(layout = R.layout.item_settings_edit_text)
 abstract class SettingsEditTextItem : EpoxyModelWithHolder<SettingsEditTextItem.Holder>() {
 
     @EpoxyAttribute var hint: String? = null
     @EpoxyAttribute var value: String? = null
+    @EpoxyAttribute var requestFocus = false
     @EpoxyAttribute var descriptionText: String? = null
     @EpoxyAttribute var errorText: String? = null
     @EpoxyAttribute var inProgress: Boolean = false
@@ -74,6 +76,9 @@ abstract class SettingsEditTextItem : EpoxyModelWithHolder<SettingsEditTextItem.
         if (value != null) {
             holder.editText.setText(value)
         }
+        if (requestFocus) {
+            holder.editText.showKeyboard(andRequestFocus = true)
+        }
     }
 
     class Holder : VectorEpoxyHolder() {
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
index 8f635f8812..f07e31bb2e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
@@ -136,8 +136,9 @@ class ThreePidsSettingsController @Inject constructor(
                     id("addingEmail")
                     inputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS)
                     hint(stringProvider.getString(R.string.medium_email))
-                    if (data.editTextReinitiator?.isTrue() == true) {
+                    if (data.editTextReinitiator.isTrue()) {
                         value("")
+                        requestFocus(true)
                     }
                     errorText(data.uiState.error)
                     interactionListener(object : SettingsEditTextItem.Listener {
@@ -199,8 +200,9 @@ class ThreePidsSettingsController @Inject constructor(
                     id("addingMsisdn")
                     inputType(InputType.TYPE_CLASS_PHONE)
                     hint(stringProvider.getString(R.string.medium_phone_number))
-                    if (data.editTextReinitiator?.isTrue() == true) {
+                    if (data.editTextReinitiator.isTrue()) {
                         value("")
+                        requestFocus(true)
                     }
                     errorText(data.uiState.error)
                     interactionListener(object : SettingsEditTextItem.Listener {
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
index 9e9c8d3092..b080c06cbd 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
@@ -28,6 +28,6 @@ data class ThreePidsSettingsViewState(
         val threePids: Async<List<ThreePid>> = Uninitialized,
         val pendingThreePids: Async<List<ThreePid>> = Uninitialized,
         val msisdnValidationRequests: Map<String, Async<Unit>> = emptyMap(),
-        val editTextReinitiator: ReadOnceTrue? = null,
+        val editTextReinitiator: ReadOnceTrue = ReadOnceTrue(),
         val msisdnValidationReinitiator: Map<ThreePid, ReadOnceTrue> = emptyMap()
 ) : MvRxState