diff --git a/src/filemanager.html b/src/filemanager.html
index b834062d2..a0633f1a6 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -261,8 +261,10 @@
               <tr ng-show="entries.length === 0">
                 <td colspan="5" class="text-center">No files</td>
               </tr>
-              <tr ng-repeat="entry in entries" ng-drop="drop($event, entry)" context-menu="menuOptions" model="entry" ng-dragleave="dragExit($event, entry)" ng-dragover="dragEnter($event, entry)" ng-class="{ 'entry-hovered': entry.hovered }">
-                <td ng-click="open(entry)" ng-class="{ 'hand': !entry.isSymbolicLink }" class="text-center"><i class="fas fa-lg {{ entry.icon }}"></i></td>
+              <tr ng-repeat="entry in entries | orderBy:sortProperty:sortAsc | orderBy:'isDirectory':true" ng-drop="drop($event, entry)" context-menu="menuOptions" model="entry" ng-dragleave="dragExit($event, entry)" ng-dragover="dragEnter($event, entry)" ng-class="{ 'entry-hovered': entry.hovered }">
+                <td ng-click="open(entry)" ng-class="{ 'hand': !entry.isSymbolicLink }" class="text-center">
+                  <i class="fas fa-lg {{ entry.icon }}" ng-class="{ 'text-primary': entry.isDirectory }"></i>
+                </td>
                 <td ng-class="{ 'hand': !entry.isSymbolicLink }" class="elide-table-cell" ng-click="open(entry)">{{ entry.fileName }}<span ng-show="entry.isSymbolicLink" class="text-muted" style="margin-left: 20px;">symlink to {{ entry.target }}</span></td>
                 <td ng-class="{ 'hand': !entry.isSymbolicLink }" class="elide-table-cell" ng-click="open(entry)">{{ entry.size | prettyByteSize }}</td>
                 <td ng-class="{ 'hand': !entry.isSymbolicLink }" class="elide-table-cell" ng-click="open(entry)">{{ entry.uid | prettyOwner }}</td>
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index 8e0109ad3..9d1afe404 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -71,6 +71,8 @@ app.controller('FileManagerController', ['$scope', '$timeout', 'Client', functio
     $scope.app = null;
     $scope.entries = [];
     $scope.dropToBody = false;
+    $scope.sortAsc = true;
+    $scope.sortProperty = 'fileName';
 
     $scope.owners = [
         { name: 'cloudron', value: 1000 },