diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php
index 0a60e9f96..93d0f8e18 100644
--- a/modules/menu/menu.admin.controller.php
+++ b/modules/menu/menu.admin.controller.php
@@ -90,7 +90,7 @@ class MenuAdminController extends Menu
 	{
 		$args = new stdClass();
 		$args->site_srl = $siteSrl;
-		$args->title = $title;
+		$args->title = escape($title, true, true);
 
 		$args->menu_srl = getNextSequence();
 		$args->listorder = $args->menu_srl * -1;
@@ -234,7 +234,7 @@ class MenuAdminController extends Menu
 	{
 		// List variables
 		$args = new stdClass();
-		$args->title = Context::get('title');
+		$args->title = escape(Context::get('title'), true, true);
 		$args->menu_srl = Context::get('menu_srl');
 
 		$output = executeQuery('menu.updateMenu', $args);
diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php
index d70fbf3e3..a998793e8 100644
--- a/modules/menu/menu.admin.model.php
+++ b/modules/menu/menu.admin.model.php
@@ -532,7 +532,8 @@ class MenuAdminModel extends Menu
 			}
 
 			$menuItems->menuSrl = $output->menu_srl;
-			$menuItems->title = $output->title;
+			$menuItems->menuNameKey = $output->title;
+			$menuItems->title = Context::replaceUserLang($value->title);
 			$menuItems->menuItems = $menu;
 			$menuList[] = $menuItems;
 		}
@@ -583,7 +584,8 @@ class MenuAdminModel extends Menu
 
 						$menuItems = new stdClass();
 						$menuItems->menuSrl = $value->menu_srl;
-						$menuItems->title = $value->title;
+						$menuItems->menuNameKey = $value->title;
+						$menuItems->title = Context::replaceUserLang($value->title);
 						$menuItems->menuItems = $menu;
 
 						// If include home menu, move first
diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html
index 94d6d4124..b352e0be6 100644
--- a/modules/menu/tpl/sitemap.html
+++ b/modules/menu/tpl/sitemap.html
@@ -64,7 +64,7 @@
 				<ul class="_itemList">
 					<li>
 						<label for="sitemapName">{$lang->sitemap_name}</label>
-						<input id="sitemapName" class="_sitemapName" type="text" required>
+						<input id="sitemapName" class="_sitemapName lang_code" type="text" required>
 					</li>
 				</ul>
 				<div class="btnBoth">
@@ -98,7 +98,7 @@
 				<ul class="_itemList">
 					<li>
 						<label for="sitemapName2">{$lang->sitemap_name}</label>
-						<input id="sitemapName2" class="_sitemapName" type="text" required>
+						<input id="sitemapName2" class="_sitemapName lang_code" type="text" required>
 					</li>
 				</ul>
 				<div class="btnBoth">
@@ -1577,7 +1577,7 @@ jQuery(function($){
 		var $panel = $('#add_sitemap');
 
 
-		var sTitle = $panel.find('INPUT._sitemapName').val();;
+		var sTitle = $panel.find('INPUT._sitemapName').val();
 		var params = {};
 		params['title'] = sTitle;
 		$.exec_json("menu.procMenuAdminInsert", params, function(htData){
@@ -1594,7 +1594,8 @@ jQuery(function($){
 		var htInfo = htNodeInfo[sMenuId];
 
 		var $panel = $(this);
-		$panel.find('INPUT._sitemapName').val(htInfo.title);
+		$panel.find('input._sitemapName').val(htInfo.menuNameKey.match(/\$user_lang->/) ? htInfo.menuNameKey : htInfo.title.escape(false).unescape());
+		$panel.find('.lang_code').trigger('reload-multilingual');
 	});
 	$('#sitemap_general ._save').click(function(){
 		var sTitle = $('#sitemap_general INPUT._sitemapName').val();