diff --git a/src/app/components/layout/app-layout/app-layout.component.spec.ts b/src/app/components/layout/app-layout/app-layout.component.spec.ts
index a5003ac05..701ac1d6c 100644
--- a/src/app/components/layout/app-layout/app-layout.component.spec.ts
+++ b/src/app/components/layout/app-layout/app-layout.component.spec.ts
@@ -28,16 +28,43 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { AppConfigService, UserPreferencesService } from '@alfresco/adf-core';
 import { AppLayoutComponent } from './app-layout.component';
 import { AppTestingModule } from '../../../testing/app-testing.module';
+import { Store } from '@ngrx/store';
+import { AppStore } from '../../../store/states';
+import { SetSelectedNodesAction } from '../../../store/actions';
+import { Router, NavigationStart } from '@angular/router';
+import { appSelection } from '../../../store/selectors/app.selectors';
+import { Subject } from 'rxjs';
+
+class MockRouter {
+  private url = 'some-url';
+  private subject = new Subject();
+  events = this.subject.asObservable();
+  routerState = { snapshot: { url: this.url } };
+
+  navigate(url: string) {
+    const navigationStart = new NavigationStart(0, url);
+    this.subject.next(navigationStart);
+  }
+}
 
 describe('AppLayoutComponent', () => {
   let fixture: ComponentFixture<AppLayoutComponent>;
   let component: AppLayoutComponent;
   let appConfig: AppConfigService;
   let userPreference: UserPreferencesService;
+  let store: Store<AppStore>;
+  let router: Router;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [AppTestingModule],
+      providers: [
+        Store,
+        {
+          provide: Router,
+          useClass: MockRouter
+        }
+      ],
       declarations: [AppLayoutComponent],
       schemas: [NO_ERRORS_SCHEMA]
     });
@@ -45,6 +72,8 @@ describe('AppLayoutComponent', () => {
     fixture = TestBed.createComponent(AppLayoutComponent);
     component = fixture.componentInstance;
     appConfig = TestBed.get(AppConfigService);
+    store = TestBed.get(Store);
+    router = TestBed.get(Router);
     userPreference = TestBed.get(UserPreferencesService);
   });
 
@@ -108,4 +137,17 @@ describe('AppLayoutComponent', () => {
       expect(component.expandedSidenav).toBe(false);
     });
   });
+
+  it('should reset selection before navigation', done => {
+    fixture.detectChanges();
+    const selection = [{ entry: { id: 'nodeId', name: 'name' } }];
+    store.dispatch(new SetSelectedNodesAction(selection));
+
+    router.navigate(['somewhere/over/the/rainbow']);
+    fixture.detectChanges();
+    store.select(appSelection).subscribe(state => {
+      expect(state.isEmpty).toBe(true);
+      done();
+    });
+  });
 });
diff --git a/src/app/components/layout/app-layout/app-layout.component.ts b/src/app/components/layout/app-layout/app-layout.component.ts
index 104a4d24c..3749b87d6 100644
--- a/src/app/components/layout/app-layout/app-layout.component.ts
+++ b/src/app/components/layout/app-layout/app-layout.component.ts
@@ -35,7 +35,7 @@ import {
   ViewChild,
   ViewEncapsulation
 } from '@angular/core';
-import { NavigationEnd, Router } from '@angular/router';
+import { NavigationEnd, Router, NavigationStart } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { Subject, Observable } from 'rxjs';
 import { filter, takeUntil, map, withLatestFrom } from 'rxjs/operators';
@@ -43,6 +43,7 @@ import { NodePermissionService } from '../../../services/node-permission.service
 import { currentFolder } from '../../../store/selectors/app.selectors';
 import { AppStore } from '../../../store/states';
 import { BreakpointObserver } from '@angular/cdk/layout';
+import { SetSelectedNodesAction } from '../../../store/actions';
 
 @Component({
   selector: 'app-layout',
@@ -131,6 +132,13 @@ export class AppLayoutComponent implements OnInit, OnDestroy {
 
         this.updateState();
       });
+
+    this.router.events
+      .pipe(
+        filter(event => event instanceof NavigationStart),
+        takeUntil(this.onDestroy$)
+      )
+      .subscribe(() => this.store.dispatch(new SetSelectedNodesAction([])));
   }
 
   ngOnDestroy() {