diff --git a/CHANGELOG b/CHANGELOG
index b992d48f0..2373913a3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,7 @@ KeePassDX(3.0.0)
  * Manually select RecycleBin group and Templates group #191
  * Fix timeout in dialogs #716
  * Check URI permissions #626
- * Small changes #1035
+ * Small changes #1035 #1043
 
 KeePassDX(2.10.5)
  * Increase the saving speed of database #1028
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 64e161c43..221e4bba5 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt
@@ -31,8 +31,11 @@ import android.text.Editable
 import android.text.TextWatcher
 import android.util.Log
 import android.view.*
+import android.view.KeyEvent.KEYCODE_ENTER
 import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
+import android.view.inputmethod.InputMethodManager
 import android.widget.*
+import android.widget.TextView.OnEditorActionListener
 import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
 import androidx.appcompat.widget.Toolbar
@@ -71,6 +74,7 @@ import com.kunzisoft.keepass.view.asError
 import com.kunzisoft.keepass.viewmodels.DatabaseFileViewModel
 import java.io.FileNotFoundException
 
+
 open class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderListener {
 
     // Views
@@ -151,6 +155,13 @@ open class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bui
                     checkboxPasswordView?.isChecked = true
             }
         })
+        passwordView?.setOnEditorActionListener(OnEditorActionListener { _, _, keyEvent ->
+            if (keyEvent.keyCode == KEYCODE_ENTER) {
+                verifyCheckboxesAndLoadDatabase()
+                return@OnEditorActionListener true
+            }
+            false
+        })
 
         // If is a view intent
         getUriFromIntent(intent)
@@ -425,6 +436,12 @@ open class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bui
         }
 
         enableOrNotTheConfirmationButton()
+
+        // Auto select the password field and open keyboard
+        passwordView?.requestFocus()
+        val imm: InputMethodManager? =
+            getSystemService(INPUT_METHOD_SERVICE) as? InputMethodManager?
+        imm?.showSoftInput(passwordView, InputMethodManager.SHOW_IMPLICIT)
     }
 
     private fun enableOrNotTheConfirmationButton() {
diff --git a/fastlane/metadata/android/en-US/changelogs/84.txt b/fastlane/metadata/android/en-US/changelogs/84.txt
index 252d0e820..46d6d2b7c 100644
--- a/fastlane/metadata/android/en-US/changelogs/84.txt
+++ b/fastlane/metadata/android/en-US/changelogs/84.txt
@@ -2,4 +2,4 @@
  * Allow to manually select RecycleBin group and Templates group #191
  * Fix timeout in dialogs #716
  * Check URI permissions #626
- * Small changes #1035
\ No newline at end of file
+ * Small changes #1035 #1043
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/84.txt b/fastlane/metadata/android/fr-FR/changelogs/84.txt
index 7f8838e1e..81d43d6ca 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/84.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/84.txt
@@ -2,4 +2,4 @@
  * Sélection manuelle des groupes de la corbeille et des templates #191
  * Correction du délai d'expiration dans les dialogues #716
  * Vérification des permissions URI #626
- * Petits changements #1035
\ No newline at end of file
+ * Petits changements #1035 #1043
\ No newline at end of file