Index: E:/workspace/liferay-portal-src-5.1.5/portal-web/docroot/html/portlet/tags_admin/javascript.js
===================================================================
--- E:/workspace/liferay-portal-src-5.1.5/portal-web/docroot/html/portlet/tags_admin/javascript.js	(revision 37)
+++ E:/workspace/liferay-portal-src-5.1.5/portal-web/docroot/html/portlet/tags_admin/javascript.js	(working copy)
@@ -131,9 +131,10 @@
 			var editEntryFields = jQuery('#' + params.editEntryFields);
 			var editEntryNameInput = jQuery('#' + params.editEntryNameInput);
 			var propertiesTable = jQuery('#' + params.propertiesTable);
+			var tem = jQuery('#' + entryId);
+			
+			editEntryNameInput.val(tem.text());
 
-			editEntryNameInput.val(name);
-
 			propertiesTable.find('tr').slice(0).remove();
 
 			Liferay.Service.Tags.TagsProperty.getProperties(
@@ -335,7 +336,7 @@
 								jQuery.each(
 									entries,
 									function(i, entry) {
-										var tagAnchor = [' ', '<a class="tag-name" href="javascript: ', instanceVar, '.editEntry(', instanceVar, ', ', entry.entryId, ', \'', encodeURIComponent(entry.name), '\');', '" tagId="', entry.entryId, '">', entry.name, '</a>'];
+										var tagAnchor = [' ', '<a id="',entry.entryId,'" class="tag-name" href="javascript: ', instanceVar, '.editEntry(', instanceVar, ', ', entry.entryId, ', \'', encodeURIComponent(entry.name), '\');', '" tagId="', entry.entryId, '">', entry.name, '</a>'];
 
 										var tagDelete = [' ', '<a class="ui-tag-delete" href="javascript: ', instanceVar, '.deleteEntry(', instanceVar, ', ', entry.entryId, ')"><span>x</span></a>'];