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 68bb8bc2f..7aa26a7a6 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt
@@ -334,12 +334,12 @@ open class PasswordActivity : SpecialModeActivity() {
                 sendBroadcast(Intent(BACK_PREVIOUS_KEYBOARD_ACTION))
             }
 
+            advancedUnlockInfoView?.visibility = View.GONE
             // Don't allow auto open prompt if lock become when UI visible
             mAllowAutoOpenBiometricPrompt = if (LockingActivity.LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK == true)
                 false
             else
                 mAllowAutoOpenBiometricPrompt
-
             mDatabaseFileUri?.let { databaseFileUri ->
                 databaseFileViewModel.loadDatabaseFile(databaseFileUri)
             }
diff --git a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedManager.kt b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedManager.kt
index ca7130390..796c144b0 100644
--- a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedManager.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedManager.kt
@@ -327,7 +327,6 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
         biometricUnlockDatabaseHelper?.closeBiometricPrompt()
         // Restore the checked listener
         checkboxPasswordView?.setOnCheckedChangeListener(onCheckedPasswordChangeListener)
-        advancedUnlockInfoView?.visibility = View.GONE
     }
 
     fun inflateOptionsMenu(menuInflater: MenuInflater, menu: Menu) {