diff --git a/workflow/engine/templates/setup/calendarList.js b/workflow/engine/templates/setup/calendarList.js
index 032cb8cf6..37d5bf604 100755
--- a/workflow/engine/templates/setup/calendarList.js
+++ b/workflow/engine/templates/setup/calendarList.js
@@ -172,8 +172,8 @@ Ext.onReady(function(){
         },
         columns: [
             {id:'CALENDAR_UID', dataIndex: 'CALENDAR_UID', hidden:true, hideable:false},
-            {header: _('ID_NAME'), dataIndex: 'CALENDAR_NAME', width: 200, align:'left'},
-            {header: _('ID_DESCRIPTION'), dataIndex: 'CALENDAR_DESCRIPTION', width: 200, align:'left'},
+            {header: _('ID_NAME'), dataIndex: 'CALENDAR_NAME', width: 200, align:'left', renderer: render_text},
+            {header: _('ID_DESCRIPTION'), dataIndex: 'CALENDAR_DESCRIPTION', width: 200, align:'left', renderer: render_text},
             {header: _('ID_STATUS'), dataIndex: 'CALENDAR_STATUS', width: 130, align:'center', renderer: render_status},
             {header: _('ID_USERS'), dataIndex: 'TOTAL_USERS', width: 69, align:'center'},
             {header: _('ID_PROCESSES'), dataIndex: 'TOTAL_PROCESS', width: 69, align:'center'},
@@ -356,6 +356,10 @@ render_status = function(v){
   }
 };
 
+render_text = function(v){
+  return Ext.util.Format.htmlEncode(v)
+};
+
 //Members Button Action
 CopyButtonAction = function(){
   rowSelected = infoGrid.getSelectionModel().getSelected();