diff --git a/src/app/settings/options.component.ts b/src/app/settings/options.component.ts
index d388286046..8c33388618 100644
--- a/src/app/settings/options.component.ts
+++ b/src/app/settings/options.component.ts
@@ -70,6 +70,15 @@ export class OptionsComponent implements OnInit {
     }
 
     async submit() {
+        if (this.vaultTimeoutAction === 'logOut') {
+            const confirmed = await this.platformUtilsService.showDialog(
+                this.i18nService.t('vaultTimeoutLogOutConfirmation'),
+                this.i18nService.t('vaultTimeoutLogOutConfirmationTitle'),
+                this.i18nService.t('yes'), this.i18nService.t('cancel'), 'warning');
+            if (!confirmed) {
+                return;
+            }
+        }
         await this.vaultTimeoutService.setVaultTimeoutOptions(this.vaultTimeout != null ? this.vaultTimeout : null,
             this.vaultTimeoutAction);
         await this.storageService.save(ConstantsService.disableFaviconKey, this.disableIcons);
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index c3251097d3..3bd7ce2e28 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -3053,5 +3053,11 @@
   "lock": {
     "message": "Lock",
     "description": "Verb form: to make secure or inaccesible by"
+  },
+  "vaultTimeoutLogOutConfirmation": {
+    "message": "Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?"
+  },
+  "vaultTimeoutLogOutConfirmationTitle": {
+    "message": "Timeout Action Confirmation"
   }
 }