diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts
index 7167bce44..2b8765ec2 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.ts
+++ b/src-ui/src/app/components/app-frame/app-frame.component.ts
@@ -27,6 +27,7 @@ import { ComponentCanDeactivate } from 'src/app/guards/dirty-doc.guard'
 import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings'
 import { ToastService } from 'src/app/services/toast.service'
 import { ComponentWithPermissions } from '../with-permissions/with-permissions.component'
+import { ExplorerListViewService } from 'src/app/services/explorer-list-view.service'
 
 @Component({
   selector: 'app-app-frame',
@@ -44,7 +45,8 @@ export class AppFrameComponent
     private searchService: SearchService,
     public savedViewService: SavedViewService,
     private remoteVersionService: RemoteVersionService,
-    private list: DocumentListViewService,
+    private documentList: DocumentListViewService,
+    private exploreList: ExplorerListViewService,
     public settingsService: SettingsService,
     public tasksService: TasksService,
     private readonly toastService: ToastService
@@ -95,6 +97,8 @@ export class AppFrameComponent
 
   closeMenu() {
     this.isMenuCollapsed = true
+    this.documentList.selectNone()
+    this.exploreList.selectNone()
   }
 
   get openDocuments(): PaperlessDocument[] {
@@ -153,7 +157,7 @@ export class AppFrameComponent
 
   search() {
     this.closeMenu()
-    this.list.quickFilter([
+    this.documentList.quickFilter([
       {
         rule_type: FILTER_FULLTEXT_QUERY,
         value: (this.searchField.value as string).trim(),
diff --git a/src-ui/src/app/components/explorer/explorer.component.ts b/src-ui/src/app/components/explorer/explorer.component.ts
index 73cb4c10f..1ed9bf58d 100644
--- a/src-ui/src/app/components/explorer/explorer.component.ts
+++ b/src-ui/src/app/components/explorer/explorer.component.ts
@@ -37,6 +37,7 @@ import { FolderCreateDialogComponent } from '../common/create-dialog/folder-crea
 import { UploadLargeFileComponent } from '../common/create-dialog/upload-large-file/upload-large-file.component'
 import { ComponentWithPermissions } from '../with-permissions/with-permissions.component'
 import { FilterEditorComponent } from './filter-editor/filter-editor.component'
+import { DocumentListViewService } from 'src/app/services/document-list-view.service'
 
 @Component({
   selector: 'app-explorer',
@@ -49,6 +50,7 @@ export class ExplorerComponent
 {
   constructor(
     public list: ExplorerListViewService,
+    public documentList: DocumentListViewService,
     public savedViewService: SavedViewService,
     public route: ActivatedRoute,
     private router: Router,
@@ -188,9 +190,7 @@ export class ExplorerComponent
       .subscribe(() => this.list.reload())
   }
 
-  uploadFile() {
-    
-  }
+  uploadFile() {}
 
   uploadLargeFile() {
     var modal = this.modalService.open(UploadLargeFileComponent, {
@@ -212,6 +212,8 @@ export class ExplorerComponent
   }
 
   toggleSelected(document: PaperlessDocument, event: MouseEvent): void {
+    if (!event.shiftKey) this.documentList.toggleSelected(document)
+    else this.documentList.selectRangeTo(document)
     if (!event.shiftKey) this.list.toggleSelected(document)
     else this.list.selectRangeTo(document)
   }