diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html
index d0bf7dfea..4712954eb 100644
--- a/modules/file/tpl/file_list.html
+++ b/modules/file/tpl/file_list.html
@@ -70,7 +70,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 				<!--@endif-->
 				<!-- one document end -->
 			<tr>
-				<td><a href="{$val->download_url}">{htmlspecialchars($val->source_filename, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}</a></td>
+				<td><a href="{htmlspecialchars_decode($val->download_url)}">{htmlspecialchars($val->source_filename, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}</a></td>
 				<td class="nowr">{FileHandler::filesize($val->file_size)}</td>
 				<td class="nowr">{$val->download_count}</td>
 				<td class="nowr">
diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html
index 3903c99cd..41668a9f0 100644
--- a/modules/menu/tpl/sitemap.html
+++ b/modules/menu/tpl/sitemap.html
@@ -1881,6 +1881,9 @@ jQuery(function($){
 				showMenuSelector($(this).find('._menuSelector_menuTreeContainer'), htInfo.url);
 			}else{
 				// URL shortcut
+			        var htInfo_url = htInfo.url;
+			        htInfo_url = htInfo_url.replace(/&amp;/g, '&');
+			        htInfo.url = htInfo_url;
 				$(this).find('a[href="#fix_linkUrl"]').click();
 				$(this).find('._url_link').val($('<div />').text(htInfo.url).text());