diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 1898a4849..970d41ec4 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -78,9 +78,9 @@
 </app-page-header>
 
 <div class="w-100 mb-2 mb-sm-4">
-  <app-filter-editor [hidden]="isBulkEditing" [(filterRules)]="list.filterRules" #filterEditor></app-filter-editor>
+  <app-filter-editor *ngIf="!isBulkEditing" [(filterRules)]="list.filterRules" #filterEditor></app-filter-editor>
 
-  <app-bulk-editor [hidden]="!isBulkEditing"
+  <app-bulk-editor *ngIf="isBulkEditing"
     [viewDocuments]="list.documents"
     [(selectedDocuments)]="list.selected"
     (selectPage)="list.selectPage()"
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 4ed6946e3..cfce55a0d 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -120,17 +120,23 @@ export class DocumentListComponent implements OnInit {
 
   clickTag(tagID: number) {
     this.list.selectNone()
-    this.filterEditor.toggleTag(tagID)
+    setTimeout(() => {
+      this.filterEditor.toggleTag(tagID)
+    })
   }
 
   clickCorrespondent(correspondentID: number) {
     this.list.selectNone()
-    this.filterEditor.toggleCorrespondent(correspondentID)
+    setTimeout(() => {
+      this.filterEditor.toggleCorrespondent(correspondentID)
+    })
   }
 
   clickDocumentType(documentTypeID: number) {
     this.list.selectNone()
-    this.filterEditor.toggleDocumentType(documentTypeID)
+    setTimeout(() => {
+      this.filterEditor.toggleDocumentType(documentTypeID)
+    })
   }
 
   private executeBulkOperation(method: string, args): Observable<any> {