diff --git a/CHANGELOG b/CHANGELOG
index 6933962b2..c512543dc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,7 @@
-KeePassDX(4.1.4)
+KeePassDX(4.1.6)
+ * Auto open biometric prompt from database list #2113
+
+KeePassDX(4.1.5)
  * Fix auto prompt #2111
 
 KeePassDX(4.1.4)
diff --git a/app/build.gradle b/app/build.gradle
index d5c441d4f..7b87df40b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 15
         targetSdkVersion 34
-        versionCode = 137
-        versionName = "4.1.5"
+        versionCode = 138
+        versionName = "4.1.6"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
index 2ba2638d3..4fd2fc606 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
@@ -75,6 +75,7 @@ import com.kunzisoft.keepass.utils.getParcelableCompat
 import com.kunzisoft.keepass.view.asError
 import com.kunzisoft.keepass.view.showActionErrorIfNeeded
 import com.kunzisoft.keepass.viewmodels.DatabaseFilesViewModel
+import com.kunzisoft.keepass.viewmodels.DeviceUnlockViewModel.Companion.isAutoOpenBiometricPromptAllowed
 import java.io.FileNotFoundException
 
 class FileDatabaseSelectActivity : DatabaseModeActivity(),
@@ -354,6 +355,9 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
         } else {
             mAdapterDatabaseHistory?.clearDatabaseFileHistoryList()
         }
+
+        // Allow auto open biometric prompt
+        isAutoOpenBiometricPromptAllowed = true
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
diff --git a/app/src/main/java/com/kunzisoft/keepass/viewmodels/DeviceUnlockViewModel.kt b/app/src/main/java/com/kunzisoft/keepass/viewmodels/DeviceUnlockViewModel.kt
index a9b37409f..408ed190f 100644
--- a/app/src/main/java/com/kunzisoft/keepass/viewmodels/DeviceUnlockViewModel.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/viewmodels/DeviceUnlockViewModel.kt
@@ -133,6 +133,7 @@ class DeviceUnlockViewModel(application: Application): AndroidViewModel(applicat
 
     fun disconnect() {
         this.databaseUri = null
+        closeBiometricPrompt()
         cipherDatabaseListener?.let {
             cipherDatabaseAction.unregisterDatabaseListener(it)
         }
diff --git a/fastlane/metadata/android/en-US/changelogs/138.txt b/fastlane/metadata/android/en-US/changelogs/138.txt
new file mode 100644
index 000000000..58fe2dd04
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/138.txt
@@ -0,0 +1 @@
+ * Auto open biometric prompt from database list #2113
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/138.txt b/fastlane/metadata/android/fr-FR/changelogs/138.txt
new file mode 100644
index 000000000..96ec2a3ce
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/138.txt
@@ -0,0 +1 @@
+ * Ouverture auto de la prompt biometrique depuis la liste des bases #2113
\ No newline at end of file