diff --git a/public/src/modules/uploader.js b/public/src/modules/uploader.js
index dc17484452..c54c12c912 100644
--- a/public/src/modules/uploader.js
+++ b/public/src/modules/uploader.js
@@ -37,6 +37,7 @@ define('uploader', ['csrf', 'translator'], function(csrf, translator) {
 			uploadForm.find('#params').val(JSON.stringify(data.params));
 
 			uploadModal.find('#fileUploadSubmitBtn').on('click', function() {
+				$(this).addClass('disabled');
 				uploadForm.submit();
 			});
 
@@ -54,6 +55,9 @@ define('uploader', ['csrf', 'translator'], function(csrf, translator) {
 	function onSubmit(uploadModal, fileSize, callback) {
 		function showAlert(type, message) {
 			module.hideAlerts(uploadModal);
+			if (type === 'error') {
+				uploadModal.find('#fileUploadSubmitBtn').removeClass('disabled');
+			}
 			uploadModal.find('#alert-' + type).translateText(message).removeClass('hide');
 		}