diff --git a/src/popup/generator/password-generator.component.html b/src/popup/generator/password-generator.component.html
index 6986210e94..b1fad03466 100644
--- a/src/popup/generator/password-generator.component.html
+++ b/src/popup/generator/password-generator.component.html
@@ -54,7 +54,7 @@
         <div class="box-content">
             <div class="box-content-row box-content-row-input" appBoxRow>
                 <label for="num-words">{{'numWords' | i18n}}</label>
-                <input id="num-words" type="number" min="3" max="20" (blur)="saveOptions()"
+                <input id="num-words" type="number" min="3" max="20" (change)="saveOptions()"
                     [(ngModel)]="options.numWords">
             </div>
             <div class="box-content-row box-content-row-input" appBoxRow>
@@ -80,7 +80,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"
-                        (change)="lengthChanged()" (blur)="saveOptions()">
+                        (change)="saveOptions()">
                     <input id="lengthRange" type="range" min="5" max="128" step="1" [(ngModel)]="options.length"
                         (change)="sliderChanged()" (input)="sliderInput()">
                 </div>
@@ -110,12 +110,12 @@
             <div class="box-content">
                 <div class="box-content-row box-content-row-input" appBoxRow>
                     <label for="min-number">{{'minNumbers' | i18n}}</label>
-                    <input id="min-number" type="number" min="0" max="9" (blur)="saveOptions()"
+                    <input id="min-number" type="number" min="0" max="9" (change)="saveOptions()"
                         [(ngModel)]="options.minNumber">
                 </div>
                 <div class="box-content-row box-content-row-input" appBoxRow>
                     <label for="min-special">{{'minSpecial' | i18n}}</label>
-                    <input id="min-special" type="number" min="0" max="9" (blur)="saveOptions()"
+                    <input id="min-special" type="number" min="0" max="9" (change)="saveOptions()"
                         [(ngModel)]="options.minSpecial">
                 </div>
                 <div class="box-content-row box-content-row-checkbox" appBoxRow>
diff --git a/src/popup/generator/password-generator.component.ts b/src/popup/generator/password-generator.component.ts
index 6fffda8b41..d2007d33eb 100644
--- a/src/popup/generator/password-generator.component.ts
+++ b/src/popup/generator/password-generator.component.ts
@@ -40,10 +40,6 @@ export class PasswordGeneratorComponent extends BasePasswordGeneratorComponent {
         this.close();
     }
 
-    lengthChanged() {
-        document.getElementById('length').focus();
-    }
-
     close() {
         this.location.back();
     }