diff --git a/jslib b/jslib
index 0b0245b90fb..d3a2dfe2e8e 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 0b0245b90fbb99fe677a94a2f97b8245cd255c1f
+Subproject commit d3a2dfe2e8ea27662aaf189e155d81681ced0d8e
diff --git a/src/app/tools/password-generator.component.html b/src/app/tools/password-generator.component.html
index 8e974252404..b5a35f9cd01 100644
--- a/src/app/tools/password-generator.component.html
+++ b/src/app/tools/password-generator.component.html
@@ -35,7 +35,7 @@
         <div class="form-group col-4">
             <label for="length">{{'length' | i18n}}</label>
             <input id="length" class="form-control" type="number" min="5" max="128" [(ngModel)]="options.length"
-                (blur)="saveOptions()">
+                (blur)="saveOptions()" (change)="lengthChanged()">
         </div>
         <div class="form-group col-4">
             <label for="min-number">{{'minNumbers' | i18n}}</label>
diff --git a/src/app/tools/password-generator.component.ts b/src/app/tools/password-generator.component.ts
index 58edc35b740..f2e3e47f8c4 100644
--- a/src/app/tools/password-generator.component.ts
+++ b/src/app/tools/password-generator.component.ts
@@ -43,4 +43,8 @@ export class PasswordGeneratorComponent extends BasePasswordGeneratorComponent {
             this.modal = null;
         });
     }
+
+    lengthChanged() {
+        document.getElementById('length').focus();
+    }
 }