diff --git a/modules/extravar/skins/default/assets/file_upload.js b/modules/extravar/skins/default/assets/file_upload.js
index 878ac15af..d280ea1e9 100644
--- a/modules/extravar/skins/default/assets/file_upload.js
+++ b/modules/extravar/skins/default/assets/file_upload.js
@@ -1,16 +1,16 @@
 'use strict';
 
-(function($) {
-	$(function() {
-		$('button.evFileRemover').on('click', function() {
-			const container = $(this).parents('.ev_file_upload');
+$(function() {
+	$('.ev_file_upload').each(function() {
+		const container = $(this);
+		container.find('button.evFileRemover').on('click', function() {
 			container.find('span.filename').text('');
 			container.find('span.filesize').text('');
 			container.find('input[type=hidden][name^=_delete_]').val('Y');
 			container.find('input[type=file]').val('');
+			$(this).remove();
 		});
-		$('input.rx_ev_file').on('change', function() {
-			const container = $(this).parents('.ev_file_upload');
+		container.find('input.rx_ev_file').on('change', function() {
 			const max_size = parseInt($(this).data('allowedFilesize'), 10);
 			const file_count = this.files.length;
 			for (let i = 0; i < file_count; i++) {
@@ -23,4 +23,4 @@
 			container.find('input[type=hidden][name^=_delete_]').val('N');
 		});
 	});
-})(jQuery);
+});