diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
index 0cfc77e53..fb6365b54 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
@@ -25,7 +25,7 @@
         <input #textFilterInput class="form-control form-control-sm" type="text"
         [disabled]="textFilterModifierIsNull"
         [(ngModel)]="textFilter"
-        (keyup)="textFilterKeyup($event)"
+        (keydown)="textFilterKeydown($event)"
         [ngbTypeahead]="searchAutoComplete"
         (selectItem)="itemSelected($event)"
         [readonly]="textFilterTarget === 'fulltext-morelike'">
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.spec.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.spec.ts
index 18390ab17..7cc8f3638 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.spec.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.spec.ts
@@ -2180,17 +2180,17 @@ describe('FilterEditorComponent', () => {
   it('should support Enter / Esc key on text field', () => {
     component.textFilterInput.nativeElement.value = 'foo'
     component.textFilterInput.nativeElement.dispatchEvent(
-      new KeyboardEvent('keyup', { key: 'Enter' })
+      new KeyboardEvent('keydown', { key: 'Enter' })
     )
     expect(component.textFilter).toEqual('foo')
     component.textFilterInput.nativeElement.value = 'foo bar'
     component.textFilterInput.nativeElement.dispatchEvent(
-      new KeyboardEvent('keyup', { key: 'Escape' })
+      new KeyboardEvent('keydown', { key: 'Escape' })
     )
     expect(component.textFilter).toEqual('')
     const blurSpy = jest.spyOn(component.textFilterInput.nativeElement, 'blur')
     component.textFilterInput.nativeElement.dispatchEvent(
-      new KeyboardEvent('keyup', { key: 'Escape' })
+      new KeyboardEvent('keydown', { key: 'Escape' })
     )
     expect(blurSpy).toHaveBeenCalled()
   })
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
index 21aab346d..5566f9ecd 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
@@ -1312,7 +1312,7 @@ export class FilterEditorComponent
     }
   }
 
-  textFilterKeyup(event: KeyboardEvent) {
+  textFilterKeydown(event: KeyboardEvent) {
     if (event.key == 'Enter') {
       const filterString = (
         this.textFilterInput.nativeElement as HTMLInputElement