diff --git a/www/common/common-file.js b/www/common/common-file.js
index 43d7cff2a..0b56ac055 100644
--- a/www/common/common-file.js
+++ b/www/common/common-file.js
@@ -123,6 +123,7 @@ define([
                         if (err) { return void console.error(err); } // TODO
                         console.log(title);
                         common.log(Messages._getKey('upload_success', [title]));
+                        common.prepareFeedback('upload')();
 
                         if (config.onUploaded) {
                             var data = getData(file, href);
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index df2f17379..2063f3a48 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -914,7 +914,7 @@ define([
         return '_' + parts[0].toUpperCase();
     };
 
-    var prepareFeedback = function (key) {
+    var prepareFeedback = common.prepareFeedback = function (key) {
         if (typeof(key) !== 'string') { return $.noop; }
         return function () {
             feedback(key.toUpperCase() + getAppSuffix());
@@ -929,8 +929,10 @@ define([
                 button = $('<button>', {
                     title: Messages.exportButtonTitle,
                 }).append($('<span>', {'class':'fa fa-download', style: 'font:'+size+' FontAwesome'}));
+
+                button.click(prepareFeedback(type));
                 if (callback) {
-                    button.click(prepareFeedback(type)).click(callback);
+                    button.click(callback);
                 }
                 break;
             case 'import':
@@ -962,7 +964,7 @@ define([
                     data.FM.handleFile(file, ev);
                     if (callback) { callback(); }
                 });
-                button.click(function () { $input.click(); })
+                button.click(function () { $input.click(); });
                 break;
             case 'template':
                 if (!AppConfig.enableTemplates) { return; }