diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js
index a956c5cf9..828861a90 100644
--- a/modules/admin/tpl/js/admin.js
+++ b/modules/admin/tpl/js/admin.js
@@ -1571,8 +1571,10 @@ jQuery(function($){
 
 				// load value
 				function loadValue(){
-					$displayInput.val($hiddenInput.val()).removeAttr('disabled');
-					
+					var value = $hiddenInput.val();
+					$remover.trigger('click');
+					$hiddenInput.val(value);
+					$displayInput.val(value);
 					var pattern = /^\$user_lang->/;
 					if(pattern.test($displayInput.val())){
 						function on_complete2(data){
diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html
index 0ecf9dc03..9d551d380 100644
--- a/modules/menu/tpl/sitemap.html
+++ b/modules/menu/tpl/sitemap.html
@@ -922,6 +922,11 @@ function createTreeMarkup(aNode, sParentSrl, sMenuTree, sMenuTreeNode){
 			sModuleType = aNode[i].module_type;
 			
 			sTargetPanel = "#properties";
+			
+			if(aNode[i].is_shortcut === "Y"){
+				sModuleType = "_SHORTCUT";
+			}
+
 			break;
 			
 			default:
@@ -934,10 +939,8 @@ function createTreeMarkup(aNode, sParentSrl, sMenuTree, sMenuTreeNode){
 		htNodeInfo[sNodeSrl].sNodeSrl = sNodeSrl;
 		htNodeInfo[sNodeSrl].sText = sText;
 		
-		if(nNodeType === 2){
-			htNodeInfo[sNodeSrl].sModuleType = sModuleType || "_SHORTCUT";
-		}
-
+		htNodeInfo[sNodeSrl].sModuleType = sModuleType;
+		
 		sSubTree = "";
 		if(aSubNode && aSubNode.length>0){
 			//sSubTree = createTreeMarkup(aSubNode, aNode[i], sMenuTree, sMenuTreeNode);