diff --git a/src-ui/src/app/components/document-list/document-list.component.spec.ts b/src-ui/src/app/components/document-list/document-list.component.spec.ts
index 34c4f2a40..39a340a3c 100644
--- a/src-ui/src/app/components/document-list/document-list.component.spec.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.spec.ts
@@ -604,6 +604,7 @@ describe('DocumentListComponent', () => {
   it('should support hotkeys', () => {
     fixture.detectChanges()
     const resetSpy = jest.spyOn(component['filterEditor'], 'resetSelected')
+    jest.spyOn(component, 'isFiltered', 'get').mockReturnValue(true)
     component.clickTag(1)
     document.dispatchEvent(new KeyboardEvent('keydown', { key: 'escape' }))
     expect(resetSpy).toHaveBeenCalled()
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 ff604cbc0..6c2f69157 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
@@ -188,12 +188,15 @@ export class DocumentListComponent
       })
 
     this.hotKeyService
-      .addShortcut({ keys: 'escape', description: $localize`Clear selection` })
+      .addShortcut({
+        keys: 'escape',
+        description: $localize`Reset filters / selection`,
+      })
       .pipe(takeUntil(this.unsubscribeNotifier))
       .subscribe(() => {
         if (this.list.selected.size > 0) {
           this.list.selectNone()
-        } else {
+        } else if (this.isFiltered) {
           this.filterEditor.resetSelected()
         }
       })