diff --git a/demo-shell-ng2/app/components/files/files.component.html b/demo-shell-ng2/app/components/files/files.component.html
index e5772ef0b2..9b2504dc3d 100644
--- a/demo-shell-ng2/app/components/files/files.component.html
+++ b/demo-shell-ng2/app/components/files/files.component.html
@@ -8,10 +8,6 @@
                     source="name"
                     class="full-width name-column">
             </content-column>
-            <content-column
-                    title="{{'DOCUMENT_LIST.COLUMNS.SITE' | translate}}"
-                    source="location.site">
-            </content-column>
             <content-column
                     title="{{'DOCUMENT_LIST.COLUMNS.CREATED_BY' | translate}}"
                     source="createdByUser.displayName">
@@ -78,4 +74,4 @@
     </alfresco-document-list>
 </alfresco-upload-drag-area>
 
-<alfresco-upload-button uploaddirectory="{{relativePath}}" currentFolderPath="{{absolutePath}}" (onSuccess)="refreshDocumentList($event)"></alfresco-upload-button>
\ No newline at end of file
+<alfresco-upload-button uploaddirectory="{{relativePath}}" currentFolderPath="{{absolutePath}}" (onSuccess)="refreshDocumentList($event)"></alfresco-upload-button>
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
index a3bc8dfa17..fdb8845f55 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
@@ -349,9 +349,13 @@ export class DocumentList implements OnInit, AfterViewChecked, AfterContentInit
         if (this._hasEntries(node)) {
             node.list.entries.sort((a: MinimalNodeEntity, b: MinimalNodeEntity) => {
                 if (a.entry.isFolder !== b.entry.isFolder) {
+                    // Uncomment if it is needed to make files go top on desc
+                    /*
                     return options.direction === 'asc'
                         ? (a.entry.isFolder ? -1 : 1)
                         : (a.entry.isFolder ? 1 : -1);
+                    */
+                    return a.entry.isFolder ? -1 : 1;
                 }
 
                 let left = this.getObjectValue(a.entry, options.key).toString();