diff --git a/src/filemanager.html b/src/filemanager.html
index 6092adf90..f37c0a406 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -48,6 +48,9 @@
     <!-- moment -->
     <script type="text/javascript" src="/3rdparty/js/moment.min.js"></script>
 
+    <!-- monaco-editor -->
+    <script type="text/javascript" src="/3rdparty/vs/loader.js"></script>
+
     <!-- Main Application -->
     <script type="text/javascript" src="/js/filemanager.js"></script>
 
@@ -57,6 +60,24 @@
 
   <a class="offline-banner animateMe" ng-show="client.offline" ng-cloak href="https://cloudron.io/documentation/troubleshooting/" target="_blank"><i class="fa fa-circle-notch fa-spin"></i> Cloudron is offline. Reconnecting...</a>
 
+  <!-- Modal text editor -->
+  <div class="modal fade" id="textEditorModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" style="width: 90%; max-width: 1280px;">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h4 class="modal-title">
+            Edit <b>{{ textEditor.entry.fileName }}</b>
+            <button type="button" class="btn btn-success pull-right" ng-click="textEditor.submit()" ng-disabled="textEditor.busy"><i class="fa fa-circle-notch fa-spin" ng-show="textEditor.busy"></i> Save</button>
+            <button type="button" class="btn btn-default pull-right" data-dismiss="modal">Cancel</button>
+          </h4>
+        </div>
+        <div class="modal-body" style="padding-top: 0;">
+          <div id="textEditorContainer" style="width: 100%; height: 600px; border: 0px solid black"></div>
+        </div>
+      </div>
+    </div>
+  </div>
+
   <!-- Modal remove entry -->
   <div class="modal fade" id="entryRemoveModal" tabindex="-1" role="dialog">
     <div class="modal-dialog">
@@ -235,6 +256,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="download(entry)" ng-show="entry.isFile"><i class="fas fa-download"></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>
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index 466c2d64f..d9d9276be 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -1,6 +1,9 @@
 'use strict';
 
-/* global angular, $, async */
+/* global angular, $, async, monaco */
+
+require.config({ paths: { 'vs': '3rdparty/vs' }});
+require(['vs/editor/editor.main'], function() {});
 
 // create main application module
 var app = angular.module('Application', ['angular-md5', 'ui-notification', 'ngDrag']);
@@ -162,28 +165,28 @@ app.controller('FileManagerController', ['$scope', 'Client', function ($scope, C
         });
     };
 
-    $scope.uploadFile = function () {
-        console.log('uploadFile');
-    };
-
-    $scope.uploadFolder = function () {
-        console.log('uploadFolder');
-    };
-
     $scope.open = function (entry) {
         var filePath = sanitize($scope.cwd + '/' + entry.fileName);
 
         if (entry.isDirectory) {
             setDirectory(filePath);
         } else if (entry.isFile) {
-            Client.filesGet($scope.appId, filePath, true, function (error, result) {
-                if (error) return Client.error(error);
-
-                console.log('open', result);
-            });
+            $scope.textEditor.show(entry);
         } else {}
     };
 
+    $scope.download = function (entry) {
+        var filePath = sanitize($scope.cwd + '/' + entry.fileName);
+
+        if (entry.isDirectory) return;
+
+        Client.filesGet($scope.appId, filePath, true, function (error, result) {
+            if (error) return Client.error(error);
+
+            console.log('open', result);
+        });
+    };
+
     $scope.goDirectoryUp = function () {
         setDirectory($scope.cwd + '/..');
     };
@@ -344,6 +347,55 @@ app.controller('FileManagerController', ['$scope', 'Client', function ($scope, C
         }
     };
 
+    $scope.textEditor = {
+        busy: false,
+        entry: null,
+        editor: null,
+
+        show: function (entry) {
+            $scope.textEditor.entry = entry;
+            $scope.textEditor.busy = false;
+
+            // clear model if any
+            if ($scope.textEditor.editor && $scope.textEditor.editor.getModel()) $scope.textEditor.editor.setModel(null);
+
+            $('#textEditorModal').modal('show');
+
+            var filePath = sanitize($scope.cwd + '/' + entry.fileName);
+            var language = 'javascript';
+
+            Client.filesGet($scope.appId, filePath, false, function (error, result) {
+                if (error) return Client.error(error);
+
+                if (!$scope.textEditor.editor) {
+                    $scope.textEditor.editor = monaco.editor.create(document.getElementById('textEditorContainer'), {
+                        value: result,
+                        language: language,
+                        theme: 'vs-dark'
+                    });
+                } else {
+                    $scope.textEditor.editor.setModel(monaco.editor.createModel(result, 'javascript'));
+                }
+            });
+        },
+
+        submit: function () {
+            $scope.textEditor.busy = true;
+
+            var newContent = $scope.textEditor.editor.getValue();
+            var filePath = sanitize($scope.cwd + '/' + $scope.textEditor.entry.fileName);
+            var file = new File([newContent], 'file');
+
+            Client.filesUpload($scope.appId, filePath, file, function () {}, function (error) {
+                $scope.textEditor.busy = false;
+
+                if (error) return Client.error(error);
+
+                $('#textEditorModal').modal('hide');
+            });
+        }
+    };
+
     $scope.chownEntry = {
         busy: false,
         error: null,
@@ -474,4 +526,5 @@ app.controller('FileManagerController', ['$scope', 'Client', function ($scope, C
             elem[0].setSelectionRange(0, text.indexOf('.'));
         });
     });
+
 }]);