diff --git a/app/agent/components/file-uploader/file-uploader-controller.js b/app/agent/components/file-uploader/file-uploader-controller.js
index db26c7a96..e6516c67c 100644
--- a/app/agent/components/file-uploader/file-uploader-controller.js
+++ b/app/agent/components/file-uploader/file-uploader-controller.js
@@ -13,10 +13,10 @@ angular.module('portainer.agent').controller('FileUploaderController', [
       if (!file) {
         return;
       }
-      
+
       ctrl.state.uploadInProgress = true;
       $q.when(ctrl.uploadFile(file)).finally(function toggleProgress() {
-            ctrl.state.uploadInProgress = false;
+        ctrl.state.uploadInProgress = false;
       });
     }
   }
diff --git a/app/agent/components/file-uploader/file-uploader.html b/app/agent/components/file-uploader/file-uploader.html
index c2a5ffe44..e092ce5d6 100644
--- a/app/agent/components/file-uploader/file-uploader.html
+++ b/app/agent/components/file-uploader/file-uploader.html
@@ -1,5 +1,6 @@
 <button 
   ngf-select="$ctrl.onFileSelected($file)"
-  class="btn ng-scope">
-  <i class="fa fa-upload"></i>
+  class="btn ng-scope"
+  button-spinner="$ctrl.state.uploadInProgress">
+  <i style="margin:0" class="fa fa-upload" ng-if="!$ctrl.state.uploadInProgress"></i>
 </button>