diff --git a/dashboard/src/components/ApiTokens.vue b/dashboard/src/components/ApiTokens.vue
index 2bcc2ea59..0221d2eae 100644
--- a/dashboard/src/components/ApiTokens.vue
+++ b/dashboard/src/components/ApiTokens.vue
@@ -95,7 +95,6 @@ function onReset() {
 async function onRevokeToken(id, name) {
   const yes = await inputDialog.value.confirm({
     message: t('profile.removeApiToken.title', { name }),
-    modal: true,
     confirmStyle: 'danger',
     confirmLabel: t('main.dialog.yes'),
     rejectLabel: t('main.dialog.no')
diff --git a/dashboard/src/components/AppArchive.vue b/dashboard/src/components/AppArchive.vue
index 4cb49c3e4..6253a458a 100644
--- a/dashboard/src/components/AppArchive.vue
+++ b/dashboard/src/components/AppArchive.vue
@@ -58,7 +58,6 @@ async function onRemove(archive) {
   const yes = await inputDialog.value.confirm({
     title: t('backups.deleteArchiveDialog.title', { appTitle: archive.appConfig?.manifest?.title, fqdn: archive.appConfig?.fqdn }),
     message: t('backups.deleteArchiveDialog.description'),
-    modal: true,
     confirmStyle: 'danger',
     confirmLabel: t('backups.deleteArchive.deleteAction'),
     rejectLabel: t('main.dialog.cancel')
diff --git a/dashboard/src/components/AppPasswords.vue b/dashboard/src/components/AppPasswords.vue
index 115110666..50f578b5d 100644
--- a/dashboard/src/components/AppPasswords.vue
+++ b/dashboard/src/components/AppPasswords.vue
@@ -102,7 +102,6 @@ function onCopyToClipboard(password) {
 async function onRemove(id, name) {
   const yes = await inputDialog.value.confirm({
     message: t('profile.removeAppPassword.title', { name }),
-    modal: true,
     confirmStyle: 'danger',
     confirmLabel: t('main.dialog.yes'),
     rejectLabel: t('main.dialog.no')
diff --git a/dashboard/src/components/BackupSchedule.vue b/dashboard/src/components/BackupSchedule.vue
index ed103cde0..f0cd8a9ed 100644
--- a/dashboard/src/components/BackupSchedule.vue
+++ b/dashboard/src/components/BackupSchedule.vue
@@ -81,7 +81,6 @@ async function onCleanup() {
   const yes = await inputDialog.value.confirm({
     // title: t('backups.cleanupBackups.title'),
     message: t('backups.cleanupBackups.description'),
-    modal: true,
     confirmStyle: 'danger',
     confirmLabel: t('main.dialog.yes'),
     rejectLabel: t('main.dialog.no')
diff --git a/dashboard/src/components/DomainDialog.vue b/dashboard/src/components/DomainDialog.vue
index ea15cb946..824379531 100644
--- a/dashboard/src/components/DomainDialog.vue
+++ b/dashboard/src/components/DomainDialog.vue
@@ -90,7 +90,6 @@ defineExpose({
 <template>
   <Dialog ref="dialog"
     :title="editing ? $t('domains.domainDialog.editTitle', { domain: domain }) : $t('domains.domainDialog.addTitle')"
-    :modal="busy"
     :confirm-busy="busy"
     :confirm-active="!busy && isFormValid"
     :confirm-label="$t('main.dialog.save')"
diff --git a/dashboard/src/components/FolderView.vue b/dashboard/src/components/FolderView.vue
index 318cf5491..dbaa3a4cf 100644
--- a/dashboard/src/components/FolderView.vue
+++ b/dashboard/src/components/FolderView.vue
@@ -112,7 +112,6 @@ async function onNewFile() {
     confirmStyle: 'success',
     confirmLabel: t('filemanager.newFileDialog.create'),
     rejectLabel: t('main.dialog.cancel'),
-    modal: false
   });
 
   if (!newFileName) return;
@@ -129,7 +128,6 @@ async function onNewFolder() {
     confirmStyle: 'success',
     confirmLabel: t('filemanager.newFileDialog.create'),
     rejectLabel: t('main.dialog.cancel'),
-    modal: false
   });
 
   if (!newFolderName) return;
@@ -243,7 +241,6 @@ async function deleteHandler(files) {
     confirmStyle: 'danger',
     confirmLabel: t('main.dialog.yes'),
     rejectLabel: t('main.dialog.no'),
-    modal: false
   });
 
   if (!confirmed) return;
@@ -482,23 +479,23 @@ onMounted(async () => {
     <template #dialogs>
       <Notification />
 
-      <Dialog ref="fatalErrorDialog" modal title="Error">
+      <Dialog ref="fatalErrorDialog" title="Error">
         <p>{{ fatalError }}</p>
       </Dialog>
 
-      <Dialog ref="extractInProgressDialog" modal :title="$t('filemanager.extractionInProgress')">
+      <Dialog ref="extractInProgressDialog" :title="$t('filemanager.extractionInProgress')">
         <div style="text-align: center;">
           <Spinner style="margin: 10px; width: 50px; height: 50px"/>
         </div>
       </Dialog>
 
-      <Dialog ref="pasteInProgressDialog" modal :title="$t('filemanager.pasteInProgress')">
+      <Dialog ref="pasteInProgressDialog" :title="$t('filemanager.pasteInProgress')">
         <div style="text-align: center;">
           <Spinner style="margin: 10px; width: 50px; height: 50px"/>
         </div>
       </Dialog>
 
-      <Dialog ref="deleteInProgressDialog" modal :title="$t('filemanager.deleteInProgress')">
+      <Dialog ref="deleteInProgressDialog" :title="$t('filemanager.deleteInProgress')">
         <div style="text-align: center;">
           <Spinner style="margin: 10px; width: 50px; height: 50px"/>
         </div>
diff --git a/dashboard/src/components/Terminal.vue b/dashboard/src/components/Terminal.vue
index 88d783709..f996bea5f 100644
--- a/dashboard/src/components/Terminal.vue
+++ b/dashboard/src/components/Terminal.vue
@@ -51,7 +51,6 @@ async function onDownload() {
     confirmStyle: 'success',
     confirmLabel: t('terminal.download.download'),
     rejectLabel: t('main.dialog.cancel'),
-    modal: false
   });
 
   if (!downloadFileName) return;
@@ -287,7 +286,7 @@ onMounted(async () => {
 <template>
   <MainLayout :gap="false">
     <template #dialogs>
-      <Dialog ref="fatalErrorDialog" modal title="Error">
+      <Dialog ref="fatalErrorDialog" title="Error">
         <p>{{ fatalError }}</p>
       </Dialog>
 
diff --git a/dashboard/src/views/EmailDomainView.vue b/dashboard/src/views/EmailDomainView.vue
index 78bdbd2a9..092f020c8 100644
--- a/dashboard/src/views/EmailDomainView.vue
+++ b/dashboard/src/views/EmailDomainView.vue
@@ -55,7 +55,6 @@ async function onSendTestMail() {
     confirmLabel: t('emails.testMailDialog.sendAction'),
     rejectLabel: t('main.dialog.cancel'),
     rejectStyle: 'secondary',
-    modal: false,
   });
 
   if (!address) return;
@@ -87,7 +86,6 @@ async function onAskIncomingToggle(value) {
     confirmLabel: t('email.disableEmailDialog.disableAction'),
     rejectLabel: t('main.dialog.cancel'),
     rejectStyle: 'secondary',
-    modal: false,
   });
 
   // reset switch
diff --git a/dashboard/src/views/ProfileView.vue b/dashboard/src/views/ProfileView.vue
index 67cbe1239..db246e49d 100644
--- a/dashboard/src/views/ProfileView.vue
+++ b/dashboard/src/views/ProfileView.vue
@@ -57,7 +57,6 @@ async function refreshProfile() {
 async function onChangeDisplayName(currentDisplayName) {
   const displayName = await inputDialog.value.prompt({
     message: t('profile.changeDisplayName.title'),
-    modal: false,
     value: currentDisplayName,
     confirmLabel: t('main.dialog.save'),
     confirmStyle: 'primary',
@@ -112,18 +111,16 @@ async function onRevokeAllWebAndCliTokens() {
 
 // 2fa
 const mandatory2FAHelp = ref('');
-const twoFAModal = ref(false);
 const twoFASecret = ref('');
 const twoFATotpToken = ref('');
 const twoFAQRCode = ref('');
 const twoFAEnableError = ref('');
 const twoFADialog = useTemplateRef('twoFADialog');
 
-async function onOpenTwoFASetupDialog(modal = false) {
+async function onOpenTwoFASetupDialog() {
   const [error, result] = await profileModel.setTwoFASecret();
   if (error) return console.error(error);
 
-  twoFAModal.value = modal;
   twoFAEnableError.value = '';
   twoFATotpToken.value = '';
   twoFASecret.value = result.secret;
@@ -177,7 +174,7 @@ onMounted(async () => {
   cliTokens.value = result.filter(function (c) { return c.clientId === TOKEN_TYPES.ID_CLI; });
 
   // check if we should show the 2fa setup
-  if (window.location.hash.indexOf('setup2fa') !== -1) onOpenTwoFASetupDialog(true /* modal */);
+  if (window.location.hash.indexOf('setup2fa') !== -1) onOpenTwoFASetupDialog();
 });
 
 </script>
@@ -190,7 +187,7 @@ onMounted(async () => {
     <PasswordChangeDialog ref="passwordChangeDialog" @success="refreshProfile"/>
     <DisableTwoFADialog ref="disableTwoFADialog" @success="refreshProfile"/>
 
-    <Dialog ref="twoFADialog" :title="$t('profile.enable2FA.title')" :show-x="!twoFAModal" :modal="twoFAModal">
+    <Dialog ref="twoFADialog" :title="$t('profile.enable2FA.title')">
       <div style="text-align: center; max-width: 420px">
         <p v-show="mandatory2FAHelp">{{ $t('profile.enable2FA.description') }}</p>
         <p v-html="$t('profile.enable2FA.authenticatorAppDescription', { googleAuthenticatorPlayStoreLink: 'https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2', googleAuthenticatorITunesLink: 'https://itunes.apple.com/us/app/google-authenticator/id388497605', freeOTPPlayStoreLink: 'https://play.google.com/store/apps/details?id=org.fedorahosted.freeotp', freeOTPITunesLink: 'https://itunes.apple.com/us/app/freeotp-authenticator/id872559395'})"></p>