diff --git a/src/popup/settings/folders.component.ts b/src/popup/settings/folders.component.ts
index 54465b33c8..fc3cbf2708 100644
--- a/src/popup/settings/folders.component.ts
+++ b/src/popup/settings/folders.component.ts
@@ -15,11 +15,14 @@ import { FolderService } from 'jslib/abstractions/folder.service';
 export class FoldersComponent implements OnInit {
     folders: FolderView[];
 
-    constructor(private folderService: FolderService, private router: Router) {
-    }
+    constructor(private folderService: FolderService, private router: Router) { }
 
     async ngOnInit() {
         this.folders = await this.folderService.getAllDecrypted();
+        // Remove "No Folder"
+        if (this.folders.length > 0) {
+            this.folders = this.folders.slice(0, this.folders.length - 1);
+        }
     }
 
     folderSelected(folder: FolderView) {
diff --git a/src/popup/vault/groupings.component.ts b/src/popup/vault/groupings.component.ts
index 77de2dc993..c6d552b196 100644
--- a/src/popup/vault/groupings.component.ts
+++ b/src/popup/vault/groupings.component.ts
@@ -137,9 +137,9 @@ export class GroupingsComponent extends BaseGroupingsComponent implements OnInit
     async load() {
         await super.load(false);
         await this.loadCiphers();
-        if (this.showNoFolderCiphers) {
+        if (this.showNoFolderCiphers && this.folders.length > 0) {
             // Remove "No Folder" from folder listing
-            this.folders.pop();
+            this.folders = this.folders.slice(0, this.folders.length - 1);
         }
 
         super.loaded = true;