diff --git a/app/src/main/java/com/kunzisoft/keepass/biometric/BiometricUnlockDatabaseHelper.kt b/app/src/main/java/com/kunzisoft/keepass/biometric/BiometricUnlockDatabaseHelper.kt
index c90b83f9b..63a4e53ad 100644
--- a/app/src/main/java/com/kunzisoft/keepass/biometric/BiometricUnlockDatabaseHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/BiometricUnlockDatabaseHelper.kt
@@ -149,10 +149,12 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity,
             return
         }
         try {
-            cipher?.init(Cipher.ENCRYPT_MODE, getSecretKey())
+            getSecretKey()?.let { secretKey ->
+                cipher?.init(Cipher.ENCRYPT_MODE, secretKey)
 
-            initBiometricPrompt()
-            actionIfCypherInit.invoke(biometricPrompt, cryptoObject, promptInfoStoreCredential)
+                initBiometricPrompt()
+                actionIfCypherInit.invoke(biometricPrompt, cryptoObject, promptInfoStoreCredential)
+            }
 
         } catch (unrecoverableKeyException: UnrecoverableKeyException) {
             Log.e(TAG, "Unable to initialize encrypt data", unrecoverableKeyException)
@@ -199,10 +201,13 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity,
             // important to restore spec here that was used for decryption
             val iv = Base64.decode(ivSpecValue, Base64.NO_WRAP)
             val spec = IvParameterSpec(iv)
-            cipher?.init(Cipher.DECRYPT_MODE, getSecretKey(), spec)
 
-            initBiometricPrompt()
-            actionIfCypherInit.invoke(biometricPrompt, cryptoObject, promptInfoExtractCredential)
+            getSecretKey()?.let { secretKey ->
+                cipher?.init(Cipher.DECRYPT_MODE, secretKey, spec)
+
+                initBiometricPrompt()
+                actionIfCypherInit.invoke(biometricPrompt, cryptoObject, promptInfoExtractCredential)
+            }
 
         } catch (unrecoverableKeyException: UnrecoverableKeyException) {
             Log.e(TAG, "Unable to initialize decrypt data", unrecoverableKeyException)
diff --git a/app/src/main/res/layout-v23/view_advanced_unlock.xml b/app/src/main/res/layout-v23/view_advanced_unlock.xml
index 3093bba00..03c09ce59 100644
--- a/app/src/main/res/layout-v23/view_advanced_unlock.xml
+++ b/app/src/main/res/layout-v23/view_advanced_unlock.xml
@@ -15,11 +15,13 @@
 
     <LinearLayout
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
         android:layout_marginEnd="18dp"
         android:orientation="vertical"
         android:gravity="center_vertical"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
         app:layout_constraintTop_toTopOf="@+id/biometric_delimiter"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"