diff --git a/src/popup2/tools/password-generator.component.html b/src/popup2/tools/password-generator.component.html
index 529f5d21610..e27a3f8f3c6 100644
--- a/src/popup2/tools/password-generator.component.html
+++ b/src/popup2/tools/password-generator.component.html
@@ -1,6 +1,6 @@
 <header>
     <div class="left">
-        <button type="button" appBlurClick (click)="close()">{{'close' | i18n}}</button>
+        <button type="button" appBlurClick (click)="close()">{{closeText}}</button>
     </div>
     <div class="center">
         <span class="title">{{'passGen' | i18n}}</span>
diff --git a/src/popup2/tools/password-generator.component.ts b/src/popup2/tools/password-generator.component.ts
index 40bf22e90b3..79b94025df3 100644
--- a/src/popup2/tools/password-generator.component.ts
+++ b/src/popup2/tools/password-generator.component.ts
@@ -2,12 +2,8 @@ import { ToasterService } from 'angular2-toaster';
 import { Angulartics2 } from 'angulartics2';
 
 import { Location } from '@angular/common';
-import {
-    Component,
-} from '@angular/core';
-import {
-    Router,
-} from '@angular/router';
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
 
 import { I18nService } from 'jslib/abstractions/i18n.service';
 import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service';
@@ -25,6 +21,8 @@ import {
     templateUrl: 'password-generator.component.html',
 })
 export class PasswordGeneratorComponent extends BasePasswordGeneratorComponent {
+    closeText: string;
+
     private cipherState: CipherView;
 
     constructor(passwordGenerationService: PasswordGenerationService, analytics: Angulartics2,
@@ -37,7 +35,8 @@ export class PasswordGeneratorComponent extends BasePasswordGeneratorComponent {
     async ngOnInit() {
         await super.ngOnInit();
         this.cipherState = await this.stateService.get<CipherView>('addEditCipher');
-        super.showSelect = this.cipherState != null;
+        this.showSelect = this.cipherState != null;
+        this.closeText = this.showSelect ? this.i18nService.t('cancel') : this.i18nService.t('close');
     }
 
     select() {
diff --git a/src/popup2/vault/current-tab.component.html b/src/popup2/vault/current-tab.component.html
index e61671eeff7..168fb9b91de 100644
--- a/src/popup2/vault/current-tab.component.html
+++ b/src/popup2/vault/current-tab.component.html
@@ -31,7 +31,7 @@
                                   (onSelected)="fillCipher($event)" (onView)="viewCipher($event)"
                                   *ngIf="loginCiphers.length"></app-ciphers-list>
                 <div class="box-content-row text-center padded no-hover" *ngIf="!loginCiphers.length">
-                    {{'autoFillInfo' | i18n}}
+                    <p>{{'autoFillInfo' | i18n}}</p>
                     <button type="button" class="btn primary link block" (click)="addCipher()">
                         {{'addLogin' | i18n}}
                     </button>