diff --git a/jslib b/jslib
index 0b0245b90f..d3a2dfe2e8 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 0b0245b90fbb99fe677a94a2f97b8245cd255c1f
+Subproject commit d3a2dfe2e8ea27662aaf189e155d81681ced0d8e
diff --git a/src/popup/generator/password-generator.component.html b/src/popup/generator/password-generator.component.html
index 9f84cf53ab..5f608bfeb5 100644
--- a/src/popup/generator/password-generator.component.html
+++ b/src/popup/generator/password-generator.component.html
@@ -64,7 +64,7 @@
                 <div class="box-content-row box-content-row-slider" appBoxRow>
                     <label for="length">{{'length' | i18n}}</label>
                     <input id="length" type="number" min="5" max="128" [(ngModel)]="options.length"
-                        (blur)="saveOptions()">
+                        (change)="lengthChanged()" (blur)="saveOptions()">
                     <input id="lengthRange" type="range" min="5" max="128" step="1" [(ngModel)]="options.length"
                         (change)="sliderChanged()" (input)="sliderInput()">
                 </div>
diff --git a/src/popup/generator/password-generator.component.ts b/src/popup/generator/password-generator.component.ts
index db5c936981..67874aa032 100644
--- a/src/popup/generator/password-generator.component.ts
+++ b/src/popup/generator/password-generator.component.ts
@@ -37,6 +37,10 @@ export class PasswordGeneratorComponent extends BasePasswordGeneratorComponent {
         this.close();
     }
 
+    lengthChanged() {
+        document.getElementById('length').focus();
+    }
+
     close() {
         this.location.back();
     }
diff --git a/src/popup/scss/pages.scss b/src/popup/scss/pages.scss
index 713cf2d09d..f3287b1760 100644
--- a/src/popup/scss/pages.scss
+++ b/src/popup/scss/pages.scss
@@ -11,8 +11,11 @@ app-sync {
 app-password-generator .password-block {
     font-size: $font-size-large;
     font-family: $font-family-monospace;
-    text-align: center;
     margin: 20px;
+
+    .password-wrapper {
+        text-align: center;
+    }
 }
 
 app-home {