diff --git a/src/filemanager.html b/src/filemanager.html
index dc0b86bfc..b05b6b306 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -253,10 +253,10 @@
                 <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>
+                  <button class="btn btn-xs btn-default" ng-click="download(entry)" ng-show="entry.isFile" uib-tooltip="Download"><i class="fas fa-download"></i></button>
+                  <button class="btn btn-xs btn-default" ng-click="renameEntry.show(entry)" uib-tooltip="Rename"><i class="fas fa-edit"></i></button>
+                  <button class="btn btn-xs btn-default" ng-click="chownEntry.show(entry)" uib-tooltip="Change Owner"><i class="fas fa-user-edit"></i></button>
+                  <button class="btn btn-xs btn-danger" ng-click="entryRemove.show(entry)" uib-tooltip="Delete"><i class="far fa-trash-alt"></i></button>
                 </td>
               </tr>
             </tbody>
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index bbfc1663c..63a28821a 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -6,7 +6,7 @@ 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']);
+var app = angular.module('Application', ['angular-md5', 'ui-notification', 'ngDrag', 'ui.bootstrap']);
 
 angular.module('Application').filter('prettyOwner', function () {
     return function (uid) {
@@ -53,7 +53,7 @@ angular.forEach(
 );
 angular.module('ngDrag', []).directive(ngDragEventDirectives);
 
-app.controller('FileManagerController', ['$scope', 'Client', function ($scope, Client) {
+app.controller('FileManagerController', ['$scope', '$timeout', 'Client', function ($scope, $timeout, Client) {
     var search = decodeURIComponent(window.location.search).slice(1).split('&').map(function (item) { return item.split('='); }).reduce(function (o, k) { o[k[0]] = k[1]; return o; }, {});
 
     $scope.initialized = false;
@@ -370,11 +370,13 @@ app.controller('FileManagerController', ['$scope', 'Client', function ($scope, C
                 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'
-                    });
+                    $timeout(function () {
+                        $scope.textEditor.editor = monaco.editor.create(document.getElementById('textEditorContainer'), {
+                            value: result,
+                            language: language,
+                            theme: 'vs-dark'
+                        });
+                    }, 200);
                 } else {
                     $scope.textEditor.editor.setModel(monaco.editor.createModel(result, 'javascript'));
                 }