diff --git a/src/filemanager.html b/src/filemanager.html
index 4a8cd795d..028b2f453 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -99,6 +99,33 @@
     </div>
   </div>
 
+  <!-- Modal rename entry -->
+  <div class="modal fade" id="renameEntryModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h4 class="modal-title">Rename {{ renameEntry.entry.filePath }}</h4>
+        </div>
+        <div class="modal-body">
+          <form role="form" name="renameEntryForm" ng-submit="renameEntry.submit()" autocomplete="off">
+            <fieldset>
+              <div class="form-group" ng-class="{ 'has-error': (renameEntryForm.newName.$dirty && renameEntryForm.newName.$invalid) }">
+                <label class="control-label">New Name</label>
+                <div class="control-label" ng-show="renameEntry.error">{{ renameEntry.error }}</div>
+                <input type="text" class="form-control" id="inputNewName" name="newName" ng-model="renameEntry.newName" required>
+              </div>
+              <input class="ng-hide" type="submit" ng-disabled="renameEntryForm.$invalid || renameEntry.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="renameEntry.submit()" ng-hide="renameEntry.error" ng-disabled="renameEntry.busy"><i class="fa fa-circle-notch fa-spin" ng-show="renameEntry.busy"></i> Rename</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
   <div class="main-container animateMe ng-hide " ng-show="initialized">
     <br/>
     <div class="row">
@@ -146,6 +173,7 @@
               <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-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 acc175eaf..6d64f97b9 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -2404,7 +2404,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
     };
 
     Client.prototype.filesRename = function (appId, path, newPath, callback) {
-        put('/api/v1/apps/' + appId + '/files/' + path, { newFilePath: newPath }, function (error, data, status) {
+        put('/api/v1/apps/' + appId + '/files/' + path, { newFilePath: newPath }, {}, function (error, data, status) {
             if (error) return callback(error);
             if (status !== 200) return callback(new ClientError(status, data));
 
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index 2632f622a..59751e7e5 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -113,10 +113,44 @@ app.controller('FileManagerController', ['$scope', 'Client', function ($scope, C
         }
     };
 
+    $scope.renameEntry = {
+        busy: false,
+        error: null,
+        entry: null,
+        newName: '',
+
+        show: function (entry) {
+            $scope.renameEntry.error = null;
+            $scope.renameEntry.entry = entry;
+            $scope.renameEntry.newName = entry.filePath;
+            $scope.renameEntry.busy = false;
+
+            $('#renameEntryModal').modal('show');
+        },
+
+        submit: function () {
+            $scope.renameEntry.busy = true;
+
+            var oldFilePath = sanitize($scope.cwd + '/' + $scope.renameEntry.entry.filePath);
+            var newFilePath = sanitize($scope.cwd + '/' + $scope.renameEntry.newName);
+
+            Client.filesRename($scope.appId, oldFilePath, newFilePath, function (error, result) {
+                $scope.renameEntry.busy = false;
+                if (error) return Client.error(error);
+
+                console.log('rename', result);
+
+                $scope.refresh();
+
+                $('#renameEntryModal').modal('hide');
+            });
+        }
+    };
+
     $scope.entryRemove = {
         busy: false,
         error: null,
-        entry: {},
+        entry: null,
 
         show: function (entry) {
             $scope.entryRemove.error = null;