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/popup/components/password-reprompt.component.html b/src/popup/components/password-reprompt.component.html
index fd41a1a5b4..3ef88b7bc7 100644
--- a/src/popup/components/password-reprompt.component.html
+++ b/src/popup/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/popup/components/set-pin.component.html b/src/popup/components/set-pin.component.html
index e82f1d60c3..bd113f8cc7 100644
--- a/src/popup/components/set-pin.component.html
+++ b/src/popup/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" 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>
+                                    class="monospaced" [(ngModel)]="pin" required appInputVerbatim>
                             </div>
                             <div class="action-buttons">
                                 <button type="button" class="row-btn" appStopClick appBlurClick appA11yTitle="{{'toggleVisibility' | i18n}}"