diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 1c24ca45996..04c5a8ff282 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -80,9 +80,7 @@ window.FileList = {
 
 		this.fileSummary = this._createSummary();
 
-		this._sort = 'name';
-		this._sortDirection = 'asc';
-		this._sortComparator = this.Comparators.name;
+		this.setSort('name', 'asc');
 
 		this.breadcrumb = new BreadCrumb({
 			onClick: this._onClickBreadCrumb,
@@ -1583,7 +1581,6 @@ $(document).ready(function() {
 			targetDir = parseCurrentDirFromUrl();
 		}
 		if (targetDir) {
-			FileList.setSort('name', 'asc');
 			FileList.changeDirectory(targetDir, false);
 		}
 	};
diff --git a/apps/files_trashbin/js/filelist.js b/apps/files_trashbin/js/filelist.js
index 3bb3a92b60d..00fc7e16b88 100644
--- a/apps/files_trashbin/js/filelist.js
+++ b/apps/files_trashbin/js/filelist.js
@@ -80,6 +80,7 @@
 	FileList.initialize = function() {
 		var result = oldInit.apply(this, arguments);
 		$('.undelete').click('click', FileList._onClickRestoreSelected);
+		this.setSort('mtime', 'desc');
 		return result;
 	};