diff --git a/src/filemanager.html b/src/filemanager.html
index 893df5a10..8aecb0d2d 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -143,8 +143,8 @@
             <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>
+            <button class="btn btn-primary pull-right" ng-click="onUploadFile()">Upload File</button>
+            <button class="btn btn-primary pull-right" ng-click="onUploadFolder()">Upload Folder</button>
           </div>
 
           <br/>
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index 8a8e0dfa8..6182054c8 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -122,13 +122,13 @@ app.controller('FileManagerController', ['$scope', 'Client', function ($scope, C
         });
     }
 
-    $('#uploadFileInput').on('change', function (e) {
-        uploadFiles(e.target.files || []);
-    });
+    // file upload
+    $('#uploadFileInput').on('change', function (e) { uploadFiles(e.target.files || []); });
+    $scope.onUploadFile = function () { $('#uploadFileInput').click(); };
 
-    $scope.uploadFile = function () {
-        $('#uploadFileInput').click();
-    };
+    // folder upload
+    $('#uploadFolderInput').on('change', function (e ) { uploadFiles(e.target.files || []); });
+    $scope.onUploadFolder = function () { $('#uploadFolderInput').click(); };
 
     $scope.newDirectory = {
         busy: false,