diff --git a/core/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt b/core/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt
index ce50a56fbb..a395cdc111 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt
@@ -5,6 +5,9 @@ import android.content.Context
 import android.text.InputType
 import android.view.LayoutInflater
 import android.view.View
+import android.view.WindowManager
+import android.view.inputmethod.EditorInfo
+import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import android.widget.TextView
 import androidx.annotation.StringRes
@@ -56,25 +59,43 @@ class PasswordCheck @Inject constructor(
         userInput.setAutofillHints(View.AUTOFILL_HINT_PASSWORD, "aaps_${autoFillHintPasswordKind}")
         userInput.importantForAutofill = View.IMPORTANT_FOR_AUTOFILL_YES
 
+        fun validatePassword(): Boolean {
+            val enteredPassword = userInput.text.toString()
+            if (cryptoUtil.checkPassword(enteredPassword, password)) {
+                val im = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+                im.hideSoftInputFromWindow(userInput.windowToken, 0)
+                ok?.invoke(enteredPassword)
+                return true
+            }
+            val msg = if (pinInput) R.string.wrongpin else R.string.wrongpassword
+            ToastUtils.errorToast(context, context.getString(msg))
+            fail?.invoke()
+            return false
+        }
+
         alertDialogBuilder
             .setCancelable(false)
             .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, context.getString(labelId), R.drawable.ic_header_key))
-            .setPositiveButton(context.getString(R.string.ok)) { _, _ ->
-                val enteredPassword = userInput.text.toString()
-                if (cryptoUtil.checkPassword(enteredPassword, password)) ok?.invoke(enteredPassword)
-                else {
-                    val msg = if (pinInput) R.string.wrongpin else R.string.wrongpassword
-                    ToastUtils.errorToast(context, context.getString(msg))
-                    fail?.invoke()
-                }
-            }
-            .setNegativeButton(context.getString(R.string.cancel)
-            ) { dialog, _ ->
+            .setPositiveButton(context.getString(R.string.ok)) { _, _ -> validatePassword() }
+            .setNegativeButton(context.getString(R.string.cancel)) { dialog, _ ->
                 cancel?.invoke()
                 dialog.cancel()
             }
 
-        alertDialogBuilder.create().show()
+        val alert = alertDialogBuilder.create().apply {
+            window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
+            show()
+        }
+
+        userInput.setOnEditorActionListener { _, actionId, _ ->
+            if (actionId == EditorInfo.IME_ACTION_DONE) {
+                if (validatePassword())
+                    alert.dismiss()
+                true
+            } else {
+                false
+            }
+        }
     }
 
     @SuppressLint("InflateParams")
@@ -163,20 +184,35 @@ class PasswordCheck @Inject constructor(
         userInput.setAutofillHints(View.AUTOFILL_HINT_PASSWORD, "aaps_${autoFillHintPasswordKind}")
         userInput.importantForAutofill = View.IMPORTANT_FOR_AUTOFILL_YES
 
+        fun validatePassword() {
+            val enteredPassword = userInput.text.toString()
+            ok?.invoke(enteredPassword)
+        }
+
         alertDialogBuilder
             .setCancelable(false)
             .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, context.getString(labelId), R.drawable.ic_header_key))
-            .setPositiveButton(context.getString(R.string.ok)) { _, _ ->
-                val enteredPassword = userInput.text.toString()
-                ok?.invoke(enteredPassword)
-            }
+            .setPositiveButton(context.getString(R.string.ok)) { _, _ -> validatePassword() }
             .setNegativeButton(context.getString(R.string.cancel)
             ) { dialog, _ ->
                 cancel?.invoke()
                 dialog.cancel()
             }
 
-        alertDialogBuilder.create().show()
+        val alert = alertDialogBuilder.create().apply {
+            window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
+            show()
+        }
+
+        userInput.setOnEditorActionListener { _, actionId, _ ->
+            if (actionId == EditorInfo.IME_ACTION_DONE) {
+                validatePassword()
+                alert.dismiss()
+                true
+            } else {
+                false
+            }
+        }
     }
 
     /**
diff --git a/core/src/main/res/layout/passwordprompt.xml b/core/src/main/res/layout/passwordprompt.xml
index bfbfbde942..ea4209edc3 100644
--- a/core/src/main/res/layout/passwordprompt.xml
+++ b/core/src/main/res/layout/passwordprompt.xml
@@ -2,10 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
-    android:padding="10dp"
-    tools:context=".utils.protection.PasswordCheck">
+    android:padding="10dp">
 
     <TextView
         android:id="@+id/password_prompt_extra_message"
@@ -16,8 +14,7 @@
         android:paddingEnd="10dp"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="@color/warningAccentText"
-        android:visibility="gone"
-        />
+        android:visibility="gone" />
 
     <EditText
         android:id="@+id/password_prompt_pass"
@@ -34,6 +31,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/password_hint"
-        android:inputType="textPassword"/>
+        android:inputType="textPassword" />
 
 </LinearLayout>
\ No newline at end of file