diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 608576c83..72898c755 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -45,7 +45,7 @@
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:configChanges="keyboardHidden"
-            android:windowSoftInputMode="stateHidden" >
+            android:windowSoftInputMode="stateHidden|stateAlwaysHidden" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt
index 741f0f084..bc4f149fa 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt
@@ -268,7 +268,7 @@ open class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bui
                 if (result.isSuccess) {
                     launchGroupActivityIfLoaded(database)
                 } else {
-                    passwordView?.requestFocus()
+                    passwordView?.requestFocusFromTouch()
 
                     var resultError = ""
                     val resultException = result.exception
@@ -443,9 +443,8 @@ open class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bui
 
         // Auto select the password field and open keyboard
         passwordView?.requestFocusFromTouch()
-        val imm: InputMethodManager? =
-            getSystemService(INPUT_METHOD_SERVICE) as? InputMethodManager?
-        imm?.showSoftInput(passwordView, InputMethodManager.SHOW_IMPLICIT)
+        val inputMethodManager = getSystemService(INPUT_METHOD_SERVICE) as? InputMethodManager?
+        inputMethodManager?.showSoftInput(passwordView, InputMethodManager.SHOW_IMPLICIT)
     }
 
     private fun enableOrNotTheConfirmationButton() {
diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml
index 750e12fb6..feeebab31 100644
--- a/app/src/main/res/layout/activity_password.xml
+++ b/app/src/main/res/layout/activity_password.xml
@@ -160,6 +160,8 @@
                                 android:inputType="textPassword"
                                 android:importantForAccessibility="no"
                                 android:importantForAutofill="yes"
+                                android:focusable="true"
+                                android:focusableInTouchMode="true"
                                 android:autofillHints="password"
                                 android:imeOptions="actionDone|flagNoPersonalizedLearning"
                                 android:maxLines="1"/>