diff --git a/src/popup/app/tools/password-generator-history.component.html b/src/popup/app/tools/password-generator-history.component.html
index 6f207e8744..0508627b5a 100644
--- a/src/popup/app/tools/password-generator-history.component.html
+++ b/src/popup/app/tools/password-generator-history.component.html
@@ -8,7 +8,7 @@
     <div class="title">{{$ctrl.i18n.passwordHistory}}</div>
 </div>
 <div class="content">
-    <div class="list">
+    <div class="list" ng-if="$ctrl.loaded">
         <div class="list-grouped" ng-if="$ctrl.history.length !== 0">
             <div class="list-grouped-item condensed wrap"
                  ng-repeat="item in $ctrl.history | orderBy: 'date':true track by $index">
@@ -27,4 +27,7 @@
             </div>
         </div>
     </div>
+    <div class="page-loading" ng-if="!$ctrl.loaded">
+        <i class="fa fa-lg fa-spinner fa-spin"></i>
+    </div>
 </div>
diff --git a/src/popup/app/tools/password-generator-history.component.ts b/src/popup/app/tools/password-generator-history.component.ts
index 5b165e03da..38abdcf39f 100644
--- a/src/popup/app/tools/password-generator-history.component.ts
+++ b/src/popup/app/tools/password-generator-history.component.ts
@@ -10,11 +10,16 @@ export class PasswordGeneratorHistoryController {
     editState: any;
     addState: any;
     i18n: any;
+    loaded: boolean = false;
 
     constructor(private $state: any, private passwordGenerationService: PasswordGenerationService,
         private toastr: any, private $analytics: any, private i18nService: any) {
         this.i18n = i18nService;
-        this.history = passwordGenerationService.getHistory();
+
+        passwordGenerationService.getHistory().then((history) => {
+            this.history = history;
+            this.loaded = true;
+        });
     }
 
     $onInit() {