diff --git a/apps/desktop/src/app/accounts/settings.component.html b/apps/desktop/src/app/accounts/settings.component.html
index d2b8bd055a4..d5c2c95ac5a 100644
--- a/apps/desktop/src/app/accounts/settings.component.html
+++ b/apps/desktop/src/app/accounts/settings.component.html
@@ -80,23 +80,27 @@
                 <small class="help-block" *ngIf="this.form.value.biometric && this.isMac">{{
                   "additionalTouchIdSettings" | i18n
                 }}</small>
-                <!-- Textbox for biometric app start -->
-                <div class="form-group tw-mt-2" *ngIf="this.form.value.biometric && this.isWindows">
-                  <div class="checkbox">
-                    <label for="allowBiometricUnlockOnAppRestart">
-                      <input
-                        id="allowBiometricUnlockOnAppRestart"
-                        type="checkbox"
-                        formControlName="allowBiometricUnlockOnAppRestart"
-                      />
-                      {{ "allowBiometricUnlockOnAppRestart" | i18n }}
-                    </label>
-                  </div>
+              </div>
+              <div class="form-group" *ngIf="this.form.value.biometric && this.isWindows">
+                <div class="checkbox form-group-child">
+                  <label for="allowBiometricUnlockOnAppRestart">
+                    <input
+                      id="allowBiometricUnlockOnAppRestart"
+                      type="checkbox"
+                      formControlName="allowBiometricUnlockOnAppRestart"
+                    />
+                    {{ "allowBiometricUnlockOnAppRestart" | i18n }}
+                  </label>
                 </div>
               </div>
               <div
                 class="form-group"
-                *ngIf="supportsBiometric && this.form.value.biometric && this.isMac"
+                *ngIf="
+                  supportsBiometric &&
+                  this.form.value.biometric &&
+                  (this.isMac ||
+                    (this.isWindows && this.form.value.allowBiometricUnlockOnAppRestart))
+                "
               >
                 <div class="checkbox form-group-child">
                   <label for="autoPromptBiometrics">
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index e1b2f5e309f..ce4e266907e 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -1850,7 +1850,7 @@
     "message": "Lock with master password on restart"
   },
   "allowBiometricUnlockOnAppRestart": {
-    "message": "Allow biometric unlock on app restart"
+    "message": "Allow biometric unlock for the first unlock after restarting the app"
   },
   "deleteAccount": {
     "message": "Delete account"