diff --git a/mobile/src/main/java/com/github/shadowsocks/ProfileConfigFragment.kt b/mobile/src/main/java/com/github/shadowsocks/ProfileConfigFragment.kt
index 85a4e91136..19ee2477b1 100644
--- a/mobile/src/main/java/com/github/shadowsocks/ProfileConfigFragment.kt
+++ b/mobile/src/main/java/com/github/shadowsocks/ProfileConfigFragment.kt
@@ -30,6 +30,7 @@ import android.view.MenuItem
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.getSystemService
 import androidx.core.os.bundleOf
+import androidx.preference.EditTextPreferenceDialogFragmentCompat
 import androidx.preference.Preference
 import androidx.preference.PreferenceDataStore
 import androidx.preference.SwitchPreference
@@ -152,13 +153,17 @@ class ProfileConfigFragment : PreferenceFragmentCompat(),
     }
 
     override fun onDisplayPreferenceDialog(preference: Preference) {
-        if (preference.key == Key.pluginConfigure) {
-            val intent = PluginManager.buildIntent(pluginConfiguration.selected, PluginContract.ACTION_CONFIGURE)
-            if (intent.resolveActivity(requireContext().packageManager) == null) showPluginEditor() else
-                startActivityForResult(intent
-                        .putExtra(PluginContract.EXTRA_OPTIONS, pluginConfiguration.selectedOptions.toString()),
-                        REQUEST_CODE_PLUGIN_CONFIGURE)
-        } else super.onDisplayPreferenceDialog(preference)
+        when (preference.key) {
+            Key.password -> displayPreferenceDialog(EditTextPreferenceDialogFragmentCompat(), preference.key)
+            Key.pluginConfigure -> {
+                val intent = PluginManager.buildIntent(pluginConfiguration.selected, PluginContract.ACTION_CONFIGURE)
+                if (intent.resolveActivity(requireContext().packageManager) == null) showPluginEditor() else
+                    startActivityForResult(intent
+                            .putExtra(PluginContract.EXTRA_OPTIONS, pluginConfiguration.selectedOptions.toString()),
+                            REQUEST_CODE_PLUGIN_CONFIGURE)
+            }
+            else -> super.onDisplayPreferenceDialog(preference)
+        }
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
diff --git a/mobile/src/main/res/layout/preference_dialog_password.xml b/mobile/src/main/res/layout/preference_dialog_password.xml
new file mode 100644
index 0000000000..1e77685b4a
--- /dev/null
+++ b/mobile/src/main/res/layout/preference_dialog_password.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Based on: https://android.googlesource.com/platform/frameworks/support/+/4aa8bc2/preference/res/layout/preference_dialog_edittext.xml -->
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginTop="48dp"
+    android:layout_marginBottom="48dp"
+    android:overScrollMode="ifContentScrolls">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        android:orientation="vertical">
+        <TextView
+            android:id="@android:id/message"
+            style="?android:attr/textAppearanceSmall"
+            android:layout_marginBottom="48dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="?android:attr/textColorSecondary"/>
+        <com.google.android.material.textfield.TextInputLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="-4dp"
+            android:layout_marginEnd="-4dp"
+            app:passwordToggleEnabled="true">
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@android:id/edit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:inputType="textPassword"
+                android:typeface="monospace"/>
+        </com.google.android.material.textfield.TextInputLayout>
+    </LinearLayout>
+</ScrollView>
diff --git a/mobile/src/main/res/xml/pref_profile.xml b/mobile/src/main/res/xml/pref_profile.xml
index b6265f69a1..68e038a13a 100644
--- a/mobile/src/main/res/xml/pref_profile.xml
+++ b/mobile/src/main/res/xml/pref_profile.xml
@@ -23,11 +23,10 @@
                 android:title="@string/remote_port"/>
         <AutoSummaryEditTextPreference
                 android:inputType="textPassword"
-                android:typeface="monospace"
+                android:dialogLayout="@layout/preference_dialog_password"
                 app:pref_summaryPasswordSubstituteLength="0"
                 android:key="sitekey"
                 app:pref_summaryHasText="%s"
-                android:singleLine="true"
                 android:title="@string/sitekey"/>
         <SimpleMenuPreference
                 android:key="encMethod"