diff --git a/jslib b/jslib
index f09fb69882..24fe836032 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit f09fb69882525b3be7b2e257e7723eeb79b343d1
+Subproject commit 24fe836032354d4ec39435776e54dd0995e1b389
diff --git a/src/app/accounts/environment.component.html b/src/app/accounts/environment.component.html
index 36d7d95c77..72ef27c533 100644
--- a/src/app/accounts/environment.component.html
+++ b/src/app/accounts/environment.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" attr.aria-label="{{'settings' | i18n}}">
+<div class="modal fade" 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">
diff --git a/src/app/accounts/premium.component.html b/src/app/accounts/premium.component.html
index fbffa4d8fd..82b4290e3d 100644
--- a/src/app/accounts/premium.component.html
+++ b/src/app/accounts/premium.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="premiumTitle">
+<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="premiumTitle">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-body">
diff --git a/src/app/accounts/settings.component.html b/src/app/accounts/settings.component.html
index 297f0f02fc..1f3d7339d5 100644
--- a/src/app/accounts/settings.component.html
+++ b/src/app/accounts/settings.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" attr.aria-label="{{'settings' | i18n}}" cdkTrapFocus cdkTrapFocusAutoCapture>
+<div class="modal fade" 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">
diff --git a/src/app/accounts/two-factor-options.component.html b/src/app/accounts/two-factor-options.component.html
index 04f589c8a6..95789f6c97 100644
--- a/src/app/accounts/two-factor-options.component.html
+++ b/src/app/accounts/two-factor-options.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="twoStepTitle">
+<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="twoStepTitle">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-body">
diff --git a/src/app/accounts/vault-timeout-input.component.html b/src/app/accounts/vault-timeout-input.component.html
index f959adffc6..7874d18371 100644
--- a/src/app/accounts/vault-timeout-input.component.html
+++ b/src/app/accounts/vault-timeout-input.component.html
@@ -5,7 +5,7 @@
 <div [formGroup]="form">
     <div class="form-group">
         <label for="vaultTimeout">{{'vaultTimeout' | i18n}}</label>
-        <select id="vaultTimeout" name="VaultTimeout" formControlName="vaultTimeout" class="form-control">
+        <select id="vaultTimeout" name="VaultTimeout" formControlName="vaultTimeout" class="form-control" appAutofocus>
             <option *ngFor="let o of vaultTimeouts" [ngValue]="o.value">{{o.name}}</option>
         </select>
         <small class="form-text text-muted">{{'vaultTimeoutDesc' | i18n}}</small>
diff --git a/src/app/components/password-reprompt.component.html b/src/app/components/password-reprompt.component.html
index 0033cdd286..cc005a522a 100644
--- a/src/app/components/password-reprompt.component.html
+++ b/src/app/components/password-reprompt.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true">
+<div class="modal fade" role="dialog" aria-modal="true">
     <div class="modal-dialog modal-dialog-scrollable" role="document">
         <form class="modal-content" #form (ngSubmit)="submit()">
             <div class="modal-body">
diff --git a/src/app/components/set-pin.component.html b/src/app/components/set-pin.component.html
index 6b7e1d7706..21eeb84adf 100644
--- a/src/app/components/set-pin.component.html
+++ b/src/app/components/set-pin.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" cdkTrapFocus cdkTrapFocusAutoCapture>
+<div class="modal fade" role="dialog" aria-modal="true">
     <div class="modal-dialog modal-dialog-scrollable set-pin-modal" role="document">
         <form class="modal-content" #form (ngSubmit)="submit()">
             <div class="modal-body">
@@ -11,7 +11,7 @@
                             <div class="row-main">
                                 <label for="pin">{{'pin' | i18n}}</label>
                                 <input id="pin" type="{{showPin ? 'text' : 'password'}}" name="Pin" class="monospaced"
-                                    [(ngModel)]="pin" required appInputVerbatim cdkFocusInitial>
+                                    [(ngModel)]="pin" required appInputVerbatim appAutofocus>
                             </div>
                             <div class="action-buttons">
                                 <a class="row-btn" href="#" appStopClick appBlurClick
diff --git a/src/app/vault/attachments.component.html b/src/app/vault/attachments.component.html
index 9b6157ff60..0c190209ef 100644
--- a/src/app/vault/attachments.component.html
+++ b/src/app/vault/attachments.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="attachmentsTitle">
+<div class="modal fade" 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">
diff --git a/src/app/vault/collections.component.html b/src/app/vault/collections.component.html
index ff3085d22b..ca320ecbf9 100644
--- a/src/app/vault/collections.component.html
+++ b/src/app/vault/collections.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="collectionsTitle">
+<div class="modal fade" 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">
diff --git a/src/app/vault/export.component.html b/src/app/vault/export.component.html
index d4a40436ad..b6e23954f1 100644
--- a/src/app/vault/export.component.html
+++ b/src/app/vault/export.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="exportTitle">
+<div class="modal fade" 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">
diff --git a/src/app/vault/folder-add-edit.component.html b/src/app/vault/folder-add-edit.component.html
index cb7f416bf0..6ea62beff6 100644
--- a/src/app/vault/folder-add-edit.component.html
+++ b/src/app/vault/folder-add-edit.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="folderAddEditTitle">
+<div class="modal fade" 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">
diff --git a/src/app/vault/password-generator-history.component.html b/src/app/vault/password-generator-history.component.html
index 812b3026bd..134f08a3d2 100644
--- a/src/app/vault/password-generator-history.component.html
+++ b/src/app/vault/password-generator-history.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="passwordGenHistoryTitle">
+<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="passwordGenHistoryTitle">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-body">
diff --git a/src/app/vault/password-generator.component.html b/src/app/vault/password-generator.component.html
index 465bba7ead..fabc12788b 100644
--- a/src/app/vault/password-generator.component.html
+++ b/src/app/vault/password-generator.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" attr.aria-label="{{'generatePassword' | i18n}}">
+<div class="modal fade" 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">
diff --git a/src/app/vault/password-history.component.html b/src/app/vault/password-history.component.html
index ef242199d8..ae15efd694 100644
--- a/src/app/vault/password-history.component.html
+++ b/src/app/vault/password-history.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="passwordHistoryTitle">
+<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="passwordHistoryTitle">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-body">
diff --git a/src/app/vault/share.component.html b/src/app/vault/share.component.html
index 0a120dc30e..f06eec3164 100644
--- a/src/app/vault/share.component.html
+++ b/src/app/vault/share.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="moveToOrgTitle">
+<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="moveToOrgTitle">
     <div class="modal-dialog" role="document">
         <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
             <div class="modal-body">