diff --git a/apps/browser/src/vault/popup/settings/folders.component.spec.ts b/apps/browser/src/vault/popup/settings/folders.component.spec.ts
index 678e6d3f10e..7e08cc684a1 100644
--- a/apps/browser/src/vault/popup/settings/folders.component.spec.ts
+++ b/apps/browser/src/vault/popup/settings/folders.component.spec.ts
@@ -94,11 +94,12 @@ describe("FoldersComponent", () => {
     fixture.detectChanges();
   });
 
-  it("removes the last option in the folder array", (done) => {
+  it("should show all folders", (done) => {
     component.folders$.subscribe((folders) => {
       expect(folders).toEqual([
         { id: "1", name: "Folder 1" },
         { id: "2", name: "Folder 2" },
+        { id: "0", name: "No Folder" },
       ]);
       done();
     });
diff --git a/apps/browser/src/vault/popup/settings/folders.component.ts b/apps/browser/src/vault/popup/settings/folders.component.ts
index b70c17bd6a5..a38f6630949 100644
--- a/apps/browser/src/vault/popup/settings/folders.component.ts
+++ b/apps/browser/src/vault/popup/settings/folders.component.ts
@@ -53,13 +53,6 @@ export class FoldersComponent {
     this.folders$ = this.activeUserId$.pipe(
       filter((userId): userId is UserId => userId !== null),
       switchMap((userId) => this.folderService.folderViews$(userId)),
-      map((folders) => {
-        // Remove the last folder, which is the "no folder" option folder
-        if (folders.length > 0) {
-          return folders.slice(0, folders.length - 1);
-        }
-        return folders;
-      }),
     );
   }