diff --git a/src/popup2/vault/current-tab.component.html b/src/popup2/vault/current-tab.component.html
index 4e3eb6add0..0f5af00da6 100644
--- a/src/popup2/vault/current-tab.component.html
+++ b/src/popup2/vault/current-tab.component.html
@@ -1,12 +1,15 @@
 <header>
     <div class="left">
-        <app-pop-out></app-pop-out>
+        <app-pop-out *ngIf="showPopout"></app-pop-out>
+        <button type="button" appBlurClick (click)="refresh()" title="{{'refresh' | i18n}}" *ngIf="inSidebar">
+            <i class="fa fa-refresh fa-lg"></i>
+        </button>
     </div>
     <div class="center">
         <span class="title">{{'currentTab' | i18n}}</span>
     </div>
     <div class="right">
-        <button appBlurClick (click)="addCipher()" title="{{'addItem' | i18n}}">
+        <button type="button" appBlurClick (click)="addCipher()" title="{{'addItem' | i18n}}">
             <i class="fa fa-plus fa-lg"></i>
         </button>
     </div>
diff --git a/src/popup2/vault/current-tab.component.ts b/src/popup2/vault/current-tab.component.ts
index f7d39af8c2..a60a53767f 100644
--- a/src/popup2/vault/current-tab.component.ts
+++ b/src/popup2/vault/current-tab.component.ts
@@ -33,9 +33,9 @@ import { PopupUtilsService } from '../services/popup-utils.service';
 })
 export class CurrentTabComponent implements OnInit {
     pageDetails: any[] = [];
-    cardCiphers: CipherView[] = [];
-    identityCiphers: CipherView[] = [];
-    loginCiphers: CipherView[] = [];
+    cardCiphers: CipherView[];
+    identityCiphers: CipherView[];
+    loginCiphers: CipherView[];
     url: string;
     domain: string;
     canAutofill = false;
@@ -127,6 +127,10 @@ export class CurrentTabComponent implements OnInit {
             CipherType.Identity,
         ]);
 
+        this.loginCiphers = [];
+        this.cardCiphers = [];
+        this.identityCiphers = [];
+
         ciphers.forEach((c) => {
             switch (c.type) {
                 case CipherType.Login: