diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index 00fff9f2b..88c12dff9 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -116,7 +116,7 @@
               [loading]="suggestionsLoading"
               [suggestions]="suggestions"
               (getSuggestions)="getSuggestions()"
-              (addTag)="tagsInput.createTag($event)"
+              (addTag)="createTag($event)"
               (addDocumentType)="createDocumentType($event)"
               (addCorrespondent)="createCorrespondent($event)">
             </pngx-suggestions-dropdown>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts
index 1dbafd27d..66d626f94 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts
@@ -392,6 +392,23 @@ describe('DocumentDetailComponent', () => {
     currentUserCan = true
   })
 
+  it('should support creating tag', () => {
+    initNormally()
+    let openModal: NgbModalRef
+    modalService.activeInstances.subscribe((modal) => (openModal = modal[0]))
+    const modalSpy = jest.spyOn(modalService, 'open')
+    component.createTag('NewTag12')
+    expect(modalSpy).toHaveBeenCalled()
+    openModal.componentInstance.succeeded.next({
+      id: 12,
+      name: 'NewTag12',
+      is_inbox_tag: true,
+      color: '#ff0000',
+      text_color: '#000000',
+    })
+    expect(component.documentForm.get('tags').value).toContain(12)
+  })
+
   it('should support creating document type', () => {
     initNormally()
     let openModal: NgbModalRef
@@ -1059,6 +1076,30 @@ describe('DocumentDetailComponent', () => {
     expect(errorSpy).toHaveBeenCalled()
   })
 
+  it('should support removing suggestions', () => {
+    initNormally()
+    component.removeSuggestion('tag', 'Hello') // coverage
+    component.suggestions = {
+      tags: [42, 43],
+      suggested_tags: ['foo'],
+      document_types: [],
+      suggested_document_types: ['bar'],
+      correspondents: [],
+      suggested_correspondents: ['baz'],
+    }
+    component.removeSuggestion('tag', 'foo')
+    component.removeSuggestion('documentType', 'bar')
+    component.removeSuggestion('correspondent', 'baz')
+    expect(component.suggestions).toEqual({
+      tags: [42, 43],
+      suggested_tags: [],
+      document_types: [],
+      suggested_document_types: [],
+      correspondents: [],
+      suggested_correspondents: [],
+    })
+  })
+
   it('should warn when open document does not match doc retrieved from backend on init', () => {
     let openModal: NgbModalRef
     modalService.activeInstances.subscribe((modals) => (openModal = modals[0]))
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index d6deaa8bd..41fa669c8 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -90,6 +90,7 @@ import { CorrespondentEditDialogComponent } from '../common/edit-dialog/correspo
 import { DocumentTypeEditDialogComponent } from '../common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component'
 import { EditDialogMode } from '../common/edit-dialog/edit-dialog.component'
 import { StoragePathEditDialogComponent } from '../common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component'
+import { TagEditDialogComponent } from '../common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component'
 import { EmailDocumentDialogComponent } from '../common/email-document-dialog/email-document-dialog.component'
 import { CheckComponent } from '../common/input/check/check.component'
 import { DateComponent } from '../common/input/date/date.component'
@@ -699,6 +700,47 @@ export class DocumentDetailComponent
       })
   }
 
+  public removeSuggestion(type: string, value: string) {
+    if (!this.suggestions) return
+
+    switch (type) {
+      case 'tag':
+        this.suggestions.suggested_tags =
+          this.suggestions.suggested_tags.filter((t) => t !== value)
+        break
+      case 'correspondent':
+        this.suggestions.suggested_correspondents =
+          this.suggestions.suggested_correspondents.filter((c) => c !== value)
+        break
+      case 'documentType':
+        this.suggestions.suggested_document_types =
+          this.suggestions.suggested_document_types.filter((dt) => dt !== value)
+        break
+    }
+  }
+
+  createTag(newName: string) {
+    var modal = this.modalService.open(TagEditDialogComponent, {
+      backdrop: 'static',
+    })
+    modal.componentInstance.dialogMode = EditDialogMode.CREATE
+    if (newName) modal.componentInstance.object = { name: newName }
+    modal.componentInstance.succeeded
+      .pipe(
+        switchMap((newTag) => {
+          return this.tagService
+            .listAll()
+            .pipe(map((tags) => ({ newTag, tags })))
+        })
+      )
+      .pipe(takeUntil(this.unsubscribeNotifier))
+      .subscribe(({ newTag, tags }) => {
+        this.tagsInput.tags = tags.results
+        this.tagsInput.addTag(newTag.id)
+        this.removeSuggestion('tag', newName)
+      })
+  }
+
   createDocumentType(newName: string) {
     var modal = this.modalService.open(DocumentTypeEditDialogComponent, {
       backdrop: 'static',
@@ -717,6 +759,7 @@ export class DocumentDetailComponent
       .subscribe(({ newDocumentType, documentTypes }) => {
         this.documentTypes = documentTypes.results
         this.documentForm.get('document_type').setValue(newDocumentType.id)
+        this.removeSuggestion('documentType', newName)
       })
   }
 
@@ -740,6 +783,7 @@ export class DocumentDetailComponent
       .subscribe(({ newCorrespondent, correspondents }) => {
         this.correspondents = correspondents.results
         this.documentForm.get('correspondent').setValue(newCorrespondent.id)
+        this.removeSuggestion('correspondent', newName)
       })
   }