diff --git a/jami-android/app/src/main/java/cx/ring/account/ChangePasswordDialog.kt b/jami-android/app/src/main/java/cx/ring/account/ChangePasswordDialog.kt
index 7a3cdd463e8f67aeb79aef00032810600ba97cd2..36ef120511ee794b4e9d4437b4c6abd1dad63ca7 100644
--- a/jami-android/app/src/main/java/cx/ring/account/ChangePasswordDialog.kt
+++ b/jami-android/app/src/main/java/cx/ring/account/ChangePasswordDialog.kt
@@ -25,6 +25,7 @@ import android.view.WindowManager
 import android.view.inputmethod.EditorInfo
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
+import androidx.core.view.isVisible
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import cx.ring.R
@@ -38,18 +39,20 @@ class ChangePasswordDialog : DialogFragment() {
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        binding = DialogSetPasswordBinding.inflate(requireActivity().layoutInflater)
         val hasPassword = arguments?.getBoolean(AccountEditionFragment.ACCOUNT_HAS_PASSWORD_KEY, true) ?: true
         val passwordMessage = if (hasPassword) R.string.account_password_change else R.string.account_password_set
-        binding!!.oldPasswordTxtBox.visibility = if (hasPassword) View.VISIBLE else View.GONE
-        binding!!.newPasswordRepeatTxt.setOnEditorActionListener { v: TextView?, actionId: Int, event: KeyEvent? ->
-            if (actionId == EditorInfo.IME_ACTION_DONE) {
-                if (validate()) {
-                    dialog!!.dismiss()
-                    return@setOnEditorActionListener true
+
+        binding = DialogSetPasswordBinding.inflate(requireActivity().layoutInflater).apply {
+            oldPasswordTxtBox.isVisible = hasPassword
+            newPasswordRepeatTxt.setOnEditorActionListener { v: TextView?, actionId: Int, event: KeyEvent? ->
+                if (actionId == EditorInfo.IME_ACTION_DONE) {
+                    if (validate()) {
+                        dialog!!.dismiss()
+                        return@setOnEditorActionListener true
+                    }
                 }
+                false
             }
-            false
         }
         val result = MaterialAlertDialogBuilder(requireContext())
             .setView(binding!!.root)
diff --git a/jami-android/app/src/main/res/layout/dialog_set_password.xml b/jami-android/app/src/main/res/layout/dialog_set_password.xml
index f0ce63807f8a070ddbb9cd60c93731da3122179e..88dfee542f27595fcfff6ed55c9b901e364dbfce 100644
--- a/jami-android/app/src/main/res/layout/dialog_set_password.xml
+++ b/jami-android/app/src/main/res/layout/dialog_set_password.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:fadeScrollbars="false"
     android:scrollIndicators="top|bottom">
@@ -71,4 +71,4 @@
 
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file