diff --git a/app/agent/components/file-uploader/file-uploader-controller.js b/app/agent/components/file-uploader/file-uploader-controller.js
deleted file mode 100644
index d0c5ad798..000000000
--- a/app/agent/components/file-uploader/file-uploader-controller.js
+++ /dev/null
@@ -1,23 +0,0 @@
-angular.module('portainer.agent').controller('FileUploaderController', [
-  '$q',
-  function FileUploaderController($q) {
-    var ctrl = this;
-
-    ctrl.state = {
-      uploadInProgress: false,
-    };
-
-    ctrl.onFileSelected = onFileSelected;
-
-    function onFileSelected(file) {
-      if (!file) {
-        return;
-      }
-
-      ctrl.state.uploadInProgress = true;
-      $q.when(ctrl.uploadFile(file)).finally(function toggleProgress() {
-        ctrl.state.uploadInProgress = false;
-      });
-    }
-  },
-]);
diff --git a/app/agent/components/file-uploader/file-uploader.js b/app/agent/components/file-uploader/file-uploader.js
deleted file mode 100644
index 6232c7f8d..000000000
--- a/app/agent/components/file-uploader/file-uploader.js
+++ /dev/null
@@ -1,7 +0,0 @@
-angular.module('portainer.agent').component('fileUploader', {
-  templateUrl: './file-uploader.html',
-  controller: 'FileUploaderController',
-  bindings: {
-    uploadFile: '<onFileSelected',
-  },
-});
diff --git a/app/agent/components/file-uploader/file-uploader.html b/app/agent/components/file-uploader/fileUploader.html
similarity index 100%
rename from app/agent/components/file-uploader/file-uploader.html
rename to app/agent/components/file-uploader/fileUploader.html
diff --git a/app/agent/components/file-uploader/fileUploaderController.js b/app/agent/components/file-uploader/fileUploaderController.js
new file mode 100644
index 000000000..fe6f185c2
--- /dev/null
+++ b/app/agent/components/file-uploader/fileUploaderController.js
@@ -0,0 +1,29 @@
+export class FileUploaderController {
+  constructor($async) {
+    Object.assign(this, { $async });
+
+    this.state = {
+      uploadInProgress: false,
+    };
+
+    this.onFileSelected = this.onFileSelected.bind(this);
+    this.onFileSelectedAsync = this.onFileSelectedAsync.bind(this);
+  }
+
+  onFileSelected(file) {
+    return this.$async(this.onFileSelectedAsync, file);
+  }
+
+  async onFileSelectedAsync(file) {
+    if (!file) {
+      return;
+    }
+
+    this.state.uploadInProgress = true;
+    try {
+      await this.uploadFile(file);
+    } finally {
+      this.state.uploadInProgress = false;
+    }
+  }
+}
diff --git a/app/agent/components/file-uploader/index.js b/app/agent/components/file-uploader/index.js
new file mode 100644
index 000000000..6b0b37fc7
--- /dev/null
+++ b/app/agent/components/file-uploader/index.js
@@ -0,0 +1,10 @@
+import angular from 'angular';
+import { FileUploaderController } from './fileUploaderController';
+
+angular.module('portainer.agent').component('fileUploader', {
+  templateUrl: './fileUploader.html',
+  controller: FileUploaderController,
+  bindings: {
+    uploadFile: '<onFileSelected',
+  },
+});