diff --git a/etemplate/js/ajax_select.js b/etemplate/js/ajax_select.js
index f8c9fa4734..7d41ca1e11 100644
--- a/etemplate/js/ajax_select.js
+++ b/etemplate/js/ajax_select.js
@@ -334,7 +334,12 @@ function select_result(e) {
 		value.value = target.value.key;
 	}
 	if(search) {
-		search.value = target.value.value;
+		var string = target.value.value;
+		string = string.replace(/&/g, '&');
+		string = string.replace(/&lt;/g, '<');
+		string = string.replace(/&gt;/g, '>');
+
+		search.value = string;
 		var event;
 		if(document.createEvent) {
 			// Most