diff --git a/src/filemanager.html b/src/filemanager.html
index dd123182e..6092adf90 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -126,6 +126,37 @@
     </div>
   </div>
 
+  <!-- Modal chown entry -->
+  <div class="modal fade" id="chownEntryModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h4 class="modal-title">Change ownership for {{ chownEntry.entry.fileName }}</h4>
+        </div>
+        <div class="modal-body">
+          <form role="form" name="chownEntryForm" ng-submit="chownEntry.submit()" autocomplete="off">
+            <fieldset>
+              <div class="form-group" ng-class="{ 'has-error': (chownEntryForm.newOwner.$dirty && chownEntry.error) }">
+                <label class="control-label">New Owner</label>
+                <div class="control-label" for="inputNewOwner" ng-show="chownEntry.error">{{ chownEntry.error }}</div>
+                <select class="form-control" id="inputNewOwner" name="newOwner" ng-model="chownEntry.newOwner" ng-options="a.value as a.name for a in owners" ng-disabled="chownEntry.busy"></select>
+              </div>
+              <div class="form-group" ng-show="chownEntry.entry.isDirectory">
+                <input type="checkbox" id="inputNewOwnerRecursive" ng-model="chownEntry.recursive">
+                <label class="control-label" for="inputNewOwnerRecursive">Change ownership recursively</label>
+              </div>
+              <input class="ng-hide" type="submit" ng-disabled="chownEntryForm.$invalid || chownEntry.busy"/>
+            </fieldset>
+          </form>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+          <button type="button" class="btn btn-danger" ng-click="chownEntry.submit()" ng-hide="chownEntry.error" ng-disabled="chownEntry.busy"><i class="fa fa-circle-notch fa-spin" ng-show="chownEntry.busy"></i> Change Owner</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
   <!-- Modal upload -->
   <div class="modal fade" id="uploadModal" tabindex="-1" role="dialog">
     <div class="modal-dialog">
@@ -204,7 +235,8 @@
                   <td class="hand elide-table-cell" ng-click="open(entry)">{{ entry.size | prettyDiskSize }}</td>
                   <td class="hand elide-table-cell" ng-click="open(entry)">{{ entry.uid | prettyOwner }}</td>
                   <td class="text-right no-wrap" style="vertical-align: bottom">
-                    <button class="btn btn-xs btn-default" ng-click="renameEntry.show(entry)"><i class="far fa-edit"></i></button>
+                    <button class="btn btn-xs btn-default" ng-click="renameEntry.show(entry)"><i class="fas fa-edit"></i></button>
+                    <button class="btn btn-xs btn-default" ng-click="chownEntry.show(entry)"><i class="fas fa-user-edit"></i></button>
                     <button class="btn btn-xs btn-danger" ng-click="entryRemove.show(entry)"><i class="far fa-trash-alt"></i></button>
                   </td>
                 </tr>
diff --git a/src/js/client.js b/src/js/client.js
index eee1d21f7..715d13aef 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -2425,6 +2425,15 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
+    Client.prototype.filesChown = function (appId, path, uid, recursive, callback) {
+        put('/api/v1/apps/' + appId + '/files/' + path, { uid: uid, recursive: recursive }, {}, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 200) return callback(new ClientError(status, data));
+
+            callback(null, data);
+        });
+    };
+
     Client.prototype.filesRename = function (appId, path, newPath, callback) {
         put('/api/v1/apps/' + appId + '/files/' + path, { newFilePath: newPath }, {}, function (error, data, status) {
             if (error) return callback(error);
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index a8f02382a..466c2d64f 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -8,7 +8,7 @@ var app = angular.module('Application', ['angular-md5', 'ui-notification', 'ngDr
 angular.module('Application').filter('prettyOwner', function () {
     return function (uid) {
         if (uid === 0) return 'root';
-        if (uid === 33) return 'cloudron';
+        if (uid === 33) return 'www-data';
         if (uid === 1000) return 'cloudron';
         if (uid === 1001) return 'git';
 
@@ -62,6 +62,13 @@ app.controller('FileManagerController', ['$scope', 'Client', function ($scope, C
     $scope.app = null;
     $scope.entries = [];
 
+    $scope.owners = [
+        { name: 'cloudron', value: 1000 },
+        { name: 'www-data', value: 33 },
+        { name: 'git', value: 1001 },
+        { name: 'root', value: 0 }
+    ];
+
     function sanitize(filePath) {
         filePath = filePath.split('/').filter(function (a) { return !!a; }).reduce(function (a, v) {
             if (v === '.'); // do nothing
@@ -337,6 +344,43 @@ app.controller('FileManagerController', ['$scope', 'Client', function ($scope, C
         }
     };
 
+    $scope.chownEntry = {
+        busy: false,
+        error: null,
+        entry: null,
+        newOwner: 0,
+        recursive: false,
+
+        show: function (entry) {
+            $scope.chownEntry.error = null;
+            $scope.chownEntry.entry = entry;
+            $scope.chownEntry.newOwner = entry.uid;
+            $scope.chownEntry.busy = false;
+
+            // default for directories is recursive
+            $scope.chownEntry.recursive = entry.isDirectory;
+
+            $('#chownEntryModal').modal('show');
+        },
+
+        submit: function () {
+            $scope.chownEntry.busy = true;
+
+            var filePath = sanitize($scope.cwd + '/' + $scope.chownEntry.entry.fileName);
+
+            Client.filesChown($scope.appId, filePath, $scope.chownEntry.newOwner, $scope.chownEntry.recursive, function (error, result) {
+                $scope.chownEntry.busy = false;
+                if (error) return Client.error(error);
+
+                console.log('chown', result);
+
+                $scope.refresh();
+
+                $('#chownEntryModal').modal('hide');
+            });
+        }
+    };
+
     $scope.entryRemove = {
         busy: false,
         error: null,