diff --git a/src/app/accounts/environment.component.html b/src/app/accounts/environment.component.html
index f1edef09693..36d7d95c770 100644
--- a/src/app/accounts/environment.component.html
+++ b/src/app/accounts/environment.component.html
@@ -1,5 +1,5 @@
-<div class="modal fade">
-    <div class="modal-dialog">
+<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" attr.aria-label="{{'settings' | i18n}}">
+    <div class="modal-dialog" role="document">
         <form class="modal-content" (ngSubmit)="submit()">
             <div class="modal-body">
                 <div class="box">
diff --git a/src/app/accounts/premium.component.html b/src/app/accounts/premium.component.html
index 401d8ad1815..3760ca56329 100644
--- a/src/app/accounts/premium.component.html
+++ b/src/app/accounts/premium.component.html
@@ -1,9 +1,9 @@
-<div class="modal fade">
-    <div class="modal-dialog">
+<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="premiumTitle">
+    <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-body">
                 <div class="box">
-                    <div class="box-header">
+                    <div class="box-header" id="premiumTitle">
                         {{'premiumMembership' | i18n}}
                     </div>
                     <div class="box-content box-content-padded">
diff --git a/src/app/accounts/settings.component.html b/src/app/accounts/settings.component.html
index d537fdaa036..46024ae0485 100644
--- a/src/app/accounts/settings.component.html
+++ b/src/app/accounts/settings.component.html
@@ -1,5 +1,5 @@
-<div class="modal fade">
-    <div class="modal-dialog">
+<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" attr.aria-label="{{'settings' | i18n}}">
+    <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-body form">
                 <div class="box">
diff --git a/src/app/accounts/two-factor-options.component.html b/src/app/accounts/two-factor-options.component.html
index 2127870c70b..04f589c8a66 100644
--- a/src/app/accounts/two-factor-options.component.html
+++ b/src/app/accounts/two-factor-options.component.html
@@ -1,9 +1,9 @@
-<div class="modal fade">
-    <div class="modal-dialog">
+<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="twoStepTitle">
+    <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-body">
                 <div class="box">
-                    <div class="box-header">
+                    <div class="box-header" id="twoStepTitle">
                         {{'twoStepOptions' | i18n}}
                     </div>
                     <div class="box-content">
diff --git a/src/app/vault/attachments.component.html b/src/app/vault/attachments.component.html
index ab544f20a1f..9b6157ff602 100644
--- a/src/app/vault/attachments.component.html
+++ b/src/app/vault/attachments.component.html
@@ -1,9 +1,9 @@
-<div class="modal fade">
-    <div class="modal-dialog">
+<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="attachmentsTitle">
+    <div class="modal-dialog" role="document">
         <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
             <div class="modal-body">
                 <div class="box" *ngIf="cipher && cipher.hasAttachments">
-                    <div class="box-header">
+                    <div class="box-header" id="attachmentsTitle">
                         {{'attachments' | i18n}}
                     </div>
                     <div class="box-content no-hover">
diff --git a/src/app/vault/collections.component.html b/src/app/vault/collections.component.html
index 320ebda737b..ff3085d22bc 100644
--- a/src/app/vault/collections.component.html
+++ b/src/app/vault/collections.component.html
@@ -1,9 +1,9 @@
-<div class="modal fade">
-    <div class="modal-dialog">
+<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="collectionsTitle">
+    <div class="modal-dialog" role="document">
         <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
             <div class="modal-body">
                 <div class="box">
-                    <div class="box-header">
+                    <div class="box-header" id="collectionsTitle">
                         {{'collections' | i18n}}
                     </div>
                     <div class="box-content" *ngIf="!collections || !collections.length">
diff --git a/src/app/vault/export.component.html b/src/app/vault/export.component.html
index 4f67b33b4d0..7f015b2e9aa 100644
--- a/src/app/vault/export.component.html
+++ b/src/app/vault/export.component.html
@@ -1,9 +1,9 @@
-<div class="modal fade">
-    <div class="modal-dialog">
+<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="exportTitle">
+    <div class="modal-dialog" role="document">
         <form class="modal-content" #form (ngSubmit)="submit()">
             <div class="modal-body">
                 <div class="box">
-                    <div class="box-header">
+                    <div class="box-header" id="exportTitle">
                         {{'exportVault' | i18n}}
                     </div>
                     <div class="box-content">
diff --git a/src/app/vault/folder-add-edit.component.html b/src/app/vault/folder-add-edit.component.html
index 2696e21e8fe..cb7f416bf0f 100644
--- a/src/app/vault/folder-add-edit.component.html
+++ b/src/app/vault/folder-add-edit.component.html
@@ -1,9 +1,9 @@
-<div class="modal fade">
-    <div class="modal-dialog modal-sm">
+<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="folderAddEditTitle">
+    <div class="modal-dialog modal-sm" role="document">
         <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
             <div class="modal-body">
                 <div class="box">
-                    <div class="box-header">
+                    <div class="box-header" id="folderAddEditTitle">
                         {{title}}
                     </div>
                     <div class="box-content">
diff --git a/src/app/vault/password-generator-history.component.html b/src/app/vault/password-generator-history.component.html
index 178816b3b37..74f43801eaf 100644
--- a/src/app/vault/password-generator-history.component.html
+++ b/src/app/vault/password-generator-history.component.html
@@ -1,9 +1,9 @@
-<div class="modal fade">
-    <div class="modal-dialog">
+<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="passwordGenHistoryTitle">
+    <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-body">
                 <div class="box">
-                    <div class="box-header">
+                    <div class="box-header" id="passwordGenHistoryTitle">
                         {{'passwordHistory' | i18n}}
                     </div>
                     <div class="box-content condensed">
diff --git a/src/app/vault/password-generator.component.html b/src/app/vault/password-generator.component.html
index cd4d4d5d030..00d0c2fd19e 100644
--- a/src/app/vault/password-generator.component.html
+++ b/src/app/vault/password-generator.component.html
@@ -1,5 +1,5 @@
-<div class="modal fade">
-    <div class="modal-dialog modal-sm">
+<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" attr.aria-label="{{'generatePassword' | i18n}}">
+    <div class="modal-dialog modal-sm" role="document">
         <div class="modal-content">
             <div class="modal-body">
                 <div class="password-block">
diff --git a/src/app/vault/password-history.component.html b/src/app/vault/password-history.component.html
index 115d08c246a..6589751eb8f 100644
--- a/src/app/vault/password-history.component.html
+++ b/src/app/vault/password-history.component.html
@@ -1,9 +1,9 @@
-<div class="modal fade">
-    <div class="modal-dialog">
+<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="passwordHistoryTitle">
+    <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-body">
                 <div class="box">
-                    <div class="box-header">
+                    <div class="box-header" id="passwordHistoryTitle">
                         {{'passwordHistory' | i18n}}
                     </div>
                     <div class="box-content condensed">
diff --git a/src/app/vault/share.component.html b/src/app/vault/share.component.html
index 734e01d2840..012d094ff3c 100644
--- a/src/app/vault/share.component.html
+++ b/src/app/vault/share.component.html
@@ -1,9 +1,9 @@
-<div class="modal fade">
-    <div class="modal-dialog">
+<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="shareTitle">
+    <div class="modal-dialog" role="document">
         <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
             <div class="modal-body">
                 <div class="box">
-                    <div class="box-header">
+                    <div class="box-header" id="shareTitle">
                         {{'share' | i18n}}
                     </div>
                     <div class="box-content" *ngIf="!organizations || !organizations.length">