diff --git a/src/popup/generator/password-generator.component.html b/src/popup/generator/password-generator.component.html
index 6986210e941..f5a36027383 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)="lengthInput()"
                     [(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)="lengthInput()">
                     <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 6fffda8b419..48ef21852c7 100644
--- a/src/popup/generator/password-generator.component.ts
+++ b/src/popup/generator/password-generator.component.ts
@@ -40,8 +40,11 @@ export class PasswordGeneratorComponent extends BasePasswordGeneratorComponent {
         this.close();
     }
 
-    lengthChanged() {
-        document.getElementById('length').focus();
+    async lengthInput() {
+        var last = this.password;
+        this.saveOptions();
+        if(last != this.password)
+            await this.passwordGenerationService.addHistory(this.password);
     }
 
     close() {