diff --git a/src/popup/vault/current-tab.component.ts b/src/popup/vault/current-tab.component.ts
index 4663812448..1b0811ec95 100644
--- a/src/popup/vault/current-tab.component.ts
+++ b/src/popup/vault/current-tab.component.ts
@@ -144,7 +144,7 @@ export class CurrentTabComponent implements OnInit, OnDestroy {
             }
 
             if (this.popupUtilsService.inPopup(window)) {
-                BrowserApi.closePopup(window);
+                BrowserApi.closePopup(window); 
             }
         } catch {
             this.analytics.eventTrack.next({ action: 'Autofilled Error' });
diff --git a/src/popup/vault/groupings.component.html b/src/popup/vault/groupings.component.html
index e9a9a6a2e9..5ae83a8aa2 100644
--- a/src/popup/vault/groupings.component.html
+++ b/src/popup/vault/groupings.component.html
@@ -78,7 +78,7 @@
                 </a>
             </div>
         </div>
-        <div class="box list">
+        <div class="box list" *ngIf="folders.length">
             <div class="box-header">
                 {{'folders' | i18n}}
                 <span class="flex-right">{{folderCount}}</span>
@@ -98,7 +98,7 @@
                 </a>
             </div>
         </div>
-        <div class="box list">
+        <div class="box list" *ngIf="collections.length">
             <div class="box-header">
                 {{'collections' | i18n}}
                 <span class="flex-right">{{collections.length}}</span>