diff --git a/etemplate/js/etemplate.js b/etemplate/js/etemplate.js
index 7c40ca2f44..39168e1bb9 100644
--- a/etemplate/js/etemplate.js
+++ b/etemplate/js/etemplate.js
@@ -203,13 +203,23 @@ function set_style_by_class(t,c,p,v)
 function xajax_eT_wrapper(obj) {
 	if (typeof(obj) == 'object') {
 		set_style_by_class('div','popupManual','display','none');
-		document.getElementById('ajax-loader').style.display = 'inline';
+		if (document.getElementById('ajax-loader')) {
+			document.getElementById('ajax-loader').style.display = 'inline';
+		}
+		if (document.getElementById('exec[ajax-loader]')) {
+			document.getElementById('exec[ajax-loader]').style.display = 'inline';
+		}
 		var etemplate_exec_id = obj.form.etemplate_exec_id.defaultValue;
 		var submit_button = obj.name;
 		xajax_doXMLHTTP('etemplate.etemplate.process_exec', etemplate_exec_id, submit_button, xajax.getFormValues(obj.form));
 	}
 	else {
-		document.getElementById('ajax-loader').style.display = 'none';
+		if (document.getElementById('ajax-loader')) {
+			document.getElementById('ajax-loader').style.display = 'none';
+		}
+		if (document.getElementById('exec[ajax-loader]')) {
+			document.getElementById('exec[ajax-loader]').style.display = 'none';
+		}
 		set_style_by_class('div','popupManual','display','inline');
 	}
 }