diff --git a/src/filemanager.html b/src/filemanager.html
index 48ac9be36..5c049ebc4 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -118,6 +118,32 @@
     </div>
   </div>
 
+  <!-- Modal new file -->
+  <div class="modal fade" id="newFileModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h4 class="modal-title">New File</h4>
+        </div>
+        <div class="modal-body">
+          <form role="form" name="newFileForm" ng-submit="newFile.submit()" autocomplete="off">
+            <fieldset>
+              <div class="form-group" ng-class="{ 'has-error': newFile.error || (newFileForm.fileName.$dirty && newFileForm.fileName.$invalid) }">
+                <input type="text" class="form-control" id="inputFileName" name="fileName" ng-model="newFile.name" required autofocus>
+                <div class="control-label" ng-show="newFile.error">{{ newFile.error }}</div>
+              </div>
+              <input class="ng-hide" type="submit" ng-disabled="newFileForm.$invalid || newFile.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="newFile.submit()" ng-disabled="newFile.busy"><i class="fa fa-circle-notch fa-spin" ng-show="newFile.busy"></i> Create</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
   <!-- Modal rename entry -->
   <div class="modal fade" id="renameEntryModal" tabindex="-1" role="dialog">
     <div class="modal-dialog">
@@ -268,10 +294,21 @@
             <button class="btn btn-default" ng-disabled="cwd === '/'" ng-click="changeDirectory('/')"><i class="fas fa-home"></i> / </button>
             <button class="btn btn-default" ng-disabled="part.path === cwd" ng-click="changeDirectory(part.path)" ng-repeat="part in cwdParts">{{ part.name }}</button>
           </div>
-          <div class="btn-group pull-right" role="group">
-            <button class="btn btn-primary" ng-click="newDirectory.show()">New Folder</button>
-            <button class="btn btn-primary" ng-click="onUploadFile()">Upload File</button>
-            <button class="btn btn-primary" ng-click="onUploadFolder()">Upload Folder</button>
+          <div class="pull-right">
+            <div class="btn-group">
+              <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-plus"></i> New</button>
+              <ul class="dropdown-menu">
+                <li><a href="#" ng-click="newFile.show()">New File</a></li>
+                <li><a href="#" ng-click="newDirectory.show()">New Folder</a></li>
+              </ul>
+            </div>
+            <div class="btn-group">
+              <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-upload"></i> Upload</button>
+              <ul class="dropdown-menu dropdown-menu-right">
+                <li><a href="#" ng-click="onUploadFile()">Upload File</a></li>
+                <li><a href="#" ng-click="onUploadFolder()">Upload Folder</a></li>
+              </ul>
+            </div>
           </div>
         </div>
 
diff --git a/src/js/client.js b/src/js/client.js
index feff14408..e5a18d88f 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -2621,6 +2621,15 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
+    Client.prototype.filesCreateFile = function (appId, path, callback) {
+        post('/api/v1/apps/' + appId + '/files/' + path, {}, {}, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 200) return callback(new ClientError(status, data));
+
+            callback(null, data);
+        });
+    };
+
     Client.prototype.filesUpload = function (appId, path, file, progressHandler, callback) {
         var fd = new FormData();
         fd.append('file', file);
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index f507129ba..26415f7c9 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -437,6 +437,40 @@ app.controller('FileManagerController', ['$scope', '$timeout', 'Client', functio
         }
     };
 
+    $scope.newFile = {
+        busy: false,
+        error: null,
+        name: '',
+
+        show: function () {
+            $scope.newFile.error = null;
+            $scope.newFile.name = '';
+            $scope.newFile.busy = false;
+
+            $scope.newFileForm.$setUntouched();
+            $scope.newFileForm.$setPristine();
+
+            $('#newFileModal').modal('show');
+        },
+
+        submit: function () {
+            $scope.newFile.busy = true;
+            $scope.newFile.error = null;
+
+            var filePath = sanitize($scope.cwd + '/' + $scope.newFile.name);
+
+            Client.filesUpload($scope.appId, filePath, new File([], $scope.newFile.name), function () {}, function (error) {
+                $scope.newFile.busy = false;
+                if (error && error.statusCode === 409) return $scope.newFile.error = 'Already exists';
+                if (error) return Client.error(error);
+
+                $scope.refresh();
+
+                $('#newFileModal').modal('hide');
+            });
+        }
+    };
+
     $scope.renameEntry = {
         busy: false,
         error: null,
@@ -681,7 +715,7 @@ app.controller('FileManagerController', ['$scope', '$timeout', 'Client', functio
     });
 
     // setup all the dialog focus handling
-    ['newDirectoryModal', 'renameEntryModal'].forEach(function (id) {
+    ['newFileModal', 'newDirectoryModal', 'renameEntryModal'].forEach(function (id) {
         $('#' + id).on('shown.bs.modal', function () {
             $(this).find('[autofocus]:first').focus();
         });