diff --git a/src/app/components/favorites/favorites.component.html b/src/app/components/favorites/favorites.component.html
index 1e0913823..375b1ebeb 100644
--- a/src/app/components/favorites/favorites.component.html
+++ b/src/app/components/favorites/favorites.component.html
@@ -35,7 +35,7 @@
                 </empty-folder-content>
 
                 <data-columns>
-                  <ng-container *ngFor="let column of columns">
+                  <ng-container *ngFor="let column of columns; trackBy: trackById">
 
                     <ng-container *ngIf="column.template && !(column.desktopOnly && isSmallScreen)">
                       <data-column
diff --git a/src/app/components/files/files.component.html b/src/app/components/files/files.component.html
index 8848c38ee..89ea55f08 100644
--- a/src/app/components/files/files.component.html
+++ b/src/app/components/files/files.component.html
@@ -38,7 +38,7 @@
                     (name-click)="navigateTo($event.detail?.node)">
 
                     <data-columns>
-                      <ng-container *ngFor="let column of columns">
+                      <ng-container *ngFor="let column of columns; trackBy: trackById">
 
                         <ng-container *ngIf="column.template && !(column.desktopOnly && isSmallScreen)">
                           <data-column
diff --git a/src/app/components/layout/layout.component.ts b/src/app/components/layout/layout.component.ts
index e856908b5..0a1a81689 100644
--- a/src/app/components/layout/layout.component.ts
+++ b/src/app/components/layout/layout.component.ts
@@ -42,7 +42,7 @@ import { filter, takeUntil, map, withLatestFrom } from 'rxjs/operators';
 import { NodePermissionService } from '../../services/node-permission.service';
 import { currentFolder } from '../../store/selectors/app.selectors';
 import { AppStore } from '../../store/states';
-import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
+import { BreakpointObserver } from '@angular/cdk/layout';
 
 @Component({
   selector: 'app-layout',
@@ -173,7 +173,7 @@ export class LayoutComponent implements OnInit, OnDestroy {
 
   private isSmallScreen(): Observable<boolean> {
     return this.breakpointObserver
-      .observe([Breakpoints.HandsetPortrait, Breakpoints.HandsetLandscape])
+      .observe(['(max-width: 600px)'])
       .pipe(map(result => result.matches));
   }
 }
diff --git a/src/app/components/libraries/libraries.component.html b/src/app/components/libraries/libraries.component.html
index fc267691e..29f769e1d 100644
--- a/src/app/components/libraries/libraries.component.html
+++ b/src/app/components/libraries/libraries.component.html
@@ -37,7 +37,7 @@
                 </empty-folder-content>
 
                 <data-columns>
-                  <ng-container *ngFor="let column of columns">
+                  <ng-container *ngFor="let column of columns; trackBy: trackById">
 
                     <ng-container *ngIf="column.template && !(column.desktopOnly && isSmallScreen)">
                       <data-column
diff --git a/src/app/components/page.component.ts b/src/app/components/page.component.ts
index 7a16762f8..01b1b7c30 100644
--- a/src/app/components/page.component.ts
+++ b/src/app/components/page.component.ts
@@ -143,4 +143,8 @@ export abstract class PageComponent implements OnInit, OnDestroy {
   trackByActionId(index: number, action: ContentActionRef) {
     return action.id;
   }
+
+  trackById(index: number, obj: { id: string }) {
+    return obj.id;
+  }
 }
diff --git a/src/app/components/recent-files/recent-files.component.html b/src/app/components/recent-files/recent-files.component.html
index 9606ff9f7..253d80d04 100644
--- a/src/app/components/recent-files/recent-files.component.html
+++ b/src/app/components/recent-files/recent-files.component.html
@@ -37,7 +37,7 @@
                 </empty-folder-content>
 
                 <data-columns>
-                  <ng-container *ngFor="let column of columns">
+                  <ng-container *ngFor="let column of columns; trackBy: trackById">
 
                     <ng-container *ngIf="column.template && !(column.desktopOnly && isSmallScreen)">
                       <data-column
diff --git a/src/app/components/shared-files/shared-files.component.html b/src/app/components/shared-files/shared-files.component.html
index 1de7eb130..d04428c00 100644
--- a/src/app/components/shared-files/shared-files.component.html
+++ b/src/app/components/shared-files/shared-files.component.html
@@ -35,7 +35,7 @@
                 </empty-folder-content>
 
                 <data-columns>
-                  <ng-container *ngFor="let column of columns">
+                  <ng-container *ngFor="let column of columns; trackBy: trackById">
 
                     <ng-container *ngIf="column.template && !(column.desktopOnly && isSmallScreen)">
                       <data-column
diff --git a/src/app/components/trashcan/trashcan.component.html b/src/app/components/trashcan/trashcan.component.html
index 91f476958..0b4d25946 100644
--- a/src/app/components/trashcan/trashcan.component.html
+++ b/src/app/components/trashcan/trashcan.component.html
@@ -35,7 +35,7 @@
                 </empty-folder-content>
 
                 <data-columns>
-                  <ng-container *ngFor="let column of columns">
+                  <ng-container *ngFor="let column of columns; trackBy: trackById">
 
                     <ng-container *ngIf="column.template && !(column.desktopOnly && isSmallScreen)">
                       <data-column