diff --git a/apps/desktop/src/vault/app/vault/view.component.html b/apps/desktop/src/vault/app/vault/view.component.html
index 3c2c11a5627..557e7e4f4fc 100644
--- a/apps/desktop/src/vault/app/vault/view.component.html
+++ b/apps/desktop/src/vault/app/vault/view.component.html
@@ -440,7 +440,7 @@
         </div>
       </div>
     </div>
-    <div class="box" *ngIf="cipher.folderId">
+    <div class="box" *ngIf="cipher.folderId && folder">
       <div class="box-content">
         <div class="box-content-row">
           <label
diff --git a/libs/angular/src/vault/components/view.component.ts b/libs/angular/src/vault/components/view.component.ts
index a90578b6b69..e286943216c 100644
--- a/libs/angular/src/vault/components/view.component.ts
+++ b/libs/angular/src/vault/components/view.component.ts
@@ -434,6 +434,7 @@ export class ViewComponent implements OnDestroy, OnInit {
   private cleanUp() {
     this.totpCode = null;
     this.cipher = null;
+    this.folder = null;
     this.showPassword = false;
     this.showCardNumber = false;
     this.showCardCode = false;