diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 986d9fa76..9ec608f99 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -124,7 +124,7 @@
             android:configChanges="keyboardHidden" />
         <activity
             android:name="com.kunzisoft.keepass.activities.EntryEditActivity"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
         <!-- About and Settings -->
         <activity
             android:name="com.kunzisoft.keepass.activities.AboutActivity"
diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/EntryExtraFieldsItemsAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/EntryExtraFieldsItemsAdapter.kt
index 27afd8143..40a5d8cb6 100644
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/EntryExtraFieldsItemsAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/EntryExtraFieldsItemsAdapter.kt
@@ -89,7 +89,6 @@ class EntryExtraFieldsItemsAdapter(context: Context)
                 }
             })
             requestFocusField(this, extraField, true)
-            setEditTextSelection(this)
             doOnTextChanged { text, _, _, _ ->
                 extraField.protectedValue.stringValue = text.toString()
             }
@@ -138,10 +137,10 @@ class EntryExtraFieldsItemsAdapter(context: Context)
         if (field == mLastFocusedEditField.field) {
             editText.apply {
                 post {
-                    requestFocus()
                     if (setSelection) {
                         setEditTextSelection(editText)
                     }
+                    requestFocus()
                 }
             }
         }
@@ -174,7 +173,7 @@ class EntryExtraFieldsItemsAdapter(context: Context)
         return mLastFocusedEditField
     }
 
-    inner class EntryExtraFieldViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    class EntryExtraFieldViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         var extraFieldValueContainer: TextInputLayout = itemView.findViewById(R.id.entry_extra_field_value_container)
         var extraFieldValue: EditTextSelectable = itemView.findViewById(R.id.entry_extra_field_value)
         var extraFieldDeleteButton: View = itemView.findViewById(R.id.entry_extra_field_delete)