diff --git a/jami-android/app/src/main/java/cx/ring/account/JamiAccountSummaryFragment.kt b/jami-android/app/src/main/java/cx/ring/account/JamiAccountSummaryFragment.kt
index fe05d8fb9ee9da7b17e4af3f5887a07b1e86c17e..225f4397b13140e172f8e39d3e32792d9d7c1448 100644
--- a/jami-android/app/src/main/java/cx/ring/account/JamiAccountSummaryFragment.kt
+++ b/jami-android/app/src/main/java/cx/ring/account/JamiAccountSummaryFragment.kt
@@ -32,6 +32,8 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo
+import android.view.inputmethod.InputMethodManager
 import android.widget.*
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.PickVisualMediaRequest
@@ -249,6 +251,17 @@ class JamiAccountSummaryFragment :
                 QRCodeFragment.newInstance(QRCodeFragment.INDEX_CODE)
                     .show(parentFragmentManager, QRCodeFragment.TAG)
             }
+            binding.username.setOnEditorActionListener { _, actionId, _ ->
+                if (actionId == EditorInfo.IME_ACTION_DONE) {
+                    val inputMethodManager = requireContext()
+                        .getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
+                    inputMethodManager.hideSoftInputFromWindow(
+                        requireActivity().currentFocus!!.windowToken, 0
+                    )
+                    binding.username.clearFocus()
+                }
+                false
+            }
             binding.username.onFocusChangeListener = View.OnFocusChangeListener { _, hasFocus: Boolean ->
                 val name = binding.username.text
                 if (!hasFocus) {
diff --git a/jami-android/app/src/main/res/layout/frag_acc_summary.xml b/jami-android/app/src/main/res/layout/frag_acc_summary.xml
index 103f3b22db5e4f0ae761e11e8afe670987a5506f..c5e101bd7a3289a7795fa4d985cbfffb8c24293b 100644
--- a/jami-android/app/src/main/res/layout/frag_acc_summary.xml
+++ b/jami-android/app/src/main/res/layout/frag_acc_summary.xml
@@ -116,6 +116,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                         android:layout_height="wrap_content"
                         android:inputType="textPersonName"
                         android:maxLines="1"
+                        android:imeOptions="actionDone"
                         android:singleLine="true"
                         android:textColor="@color/text_color"
                         android:textStyle="bold" />