diff --git a/src/filemanager.html b/src/filemanager.html
index 32c51e56a..4a8cd795d 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -62,7 +62,7 @@
         </div>
         <div class="modal-body">
           <p class="text-bold text-danger" ng-show="entryRemove.error">{{ entryRemove.error }}</p>
-          <p ng-hide="entryRemove.error">After deletion, the user will not be able to access the dashboard or login to any of the apps. Note that any user data inside the apps is not removed.</p>
+          <p ng-hide="entryRemove.error">Really delete {{ entryRemove.entry.fileName }}</p>
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
@@ -72,6 +72,33 @@
     </div>
   </div>
 
+  <!-- Modal new directory -->
+  <div class="modal fade" id="newDirectoryModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h4 class="modal-title">New Directory</h4>
+        </div>
+        <div class="modal-body">
+          <form role="form" name="newDirectoryForm" ng-submit="newDirectory.submit()" autocomplete="off">
+            <fieldset>
+              <div class="form-group" ng-class="{ 'has-error': (newDirectoryForm.directoryName.$dirty && newDirectoryForm.directoryName.$invalid) }">
+                <label class="control-label">Directory Name</label>
+                <div class="control-label" ng-show="newDirectory.error">{{ newDirectory.error }}</div>
+                <input type="text" class="form-control" id="inputDirectoryName" name="directoryName" ng-model="newDirectory.name" required>
+              </div>
+              <input class="ng-hide" type="submit" ng-disabled="newDirectoryForm.$invalid || newDirectory.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="newDirectory.submit()" ng-hide="newDirectory.error" ng-disabled="newDirectory.busy"><i class="fa fa-circle-notch fa-spin" ng-show="newDirectory.busy"></i> Create</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
   <div class="main-container animateMe ng-hide " ng-show="initialized">
     <br/>
     <div class="row">
@@ -85,6 +112,7 @@
           <div>
             <button class="btn btn-primary" ng-click="refresh()"><i class="fas fa-sync-alt"></i></button>
             <span>Path: <b>{{ cwd }}</b></span>
+            <button class="btn btn-primary pull-right" ng-click="newDirectory.show()">New Directory</button>
             <button class="btn btn-primary pull-right" ng-click="uploadFile()">Upload File</button>
             <button class="btn btn-primary pull-right" ng-click="uploadFolder()">Upload Folder</button>
           </div>
diff --git a/src/js/client.js b/src/js/client.js
index ebd27ccaa..acc175eaf 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -2403,6 +2403,41 @@ 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) {
+            if (error) return callback(error);
+            if (status !== 200) return callback(new ClientError(status, data));
+
+            callback(null, data);
+        });
+    };
+
+    Client.prototype.filesCreateDirectory = function (appId, path, callback) {
+        post('/api/v1/apps/' + appId + '/files/' + path, { directory: path }, {}, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 200) return callback(new ClientError(status, data));
+
+            callback(null, data);
+        });
+    };
+
+    Client.prototype.filesUploadFile = function (appId, path, file, callback) {
+        var fd = new FormData();
+        fd.append('file', file);
+
+        var config = {
+            headers: { 'Content-Type': undefined },
+            transformRequest: angular.identity
+        };
+
+        post('/api/v1/apps/' + appId + '/files/' + path, fd, config, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 200) return callback(new ClientError(status, data));
+
+            callback(null, data);
+        });
+    };
+
     client = new Client();
     return client;
 }]);
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index fdfb72f3c..2632f622a 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -82,6 +82,37 @@ app.controller('FileManagerController', ['$scope', 'Client', function ($scope, C
         $scope.refresh();
     }
 
+    $scope.newDirectory = {
+        busy: false,
+        error: null,
+        name: '',
+
+        show: function () {
+            $scope.newDirectory.error = null;
+            $scope.newDirectory.name = '';
+            $scope.newDirectory.busy = false;
+
+            $('#newDirectoryModal').modal('show');
+        },
+
+        submit: function () {
+            $scope.newDirectory.busy = true;
+
+            var filePath = sanitize($scope.cwd + '/' + $scope.newDirectory.name);
+
+            Client.filesCreateDirectory($scope.appId, filePath, function (error, result) {
+                $scope.newDirectory.busy = false;
+                if (error) return Client.error(error);
+
+                console.log('create direcotory', result);
+
+                $scope.refresh();
+
+                $('#newDirectoryModal').modal('hide');
+            });
+        }
+    };
+
     $scope.entryRemove = {
         busy: false,
         error: null,