diff --git a/src/main/resources/org/biouno/unochoice/common/choiceParameterCommon.jelly b/src/main/resources/org/biouno/unochoice/common/choiceParameterCommon.jelly
index 2c0445f7..cc464f48 100644
--- a/src/main/resources/org/biouno/unochoice/common/choiceParameterCommon.jelly
+++ b/src/main/resources/org/biouno/unochoice/common/choiceParameterCommon.jelly
@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
   xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
   xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
@@ -5,8 +6,9 @@
   <st:adjunct includes="org.biouno.unochoice.stapler.unochoice"/>
   <j:set var="paramName" value="${it.randomName}" scope="parent" />
   <j:set var="choiceType" value="${it.choiceType}"/>
+  <j:set var="escapeEntryTitleAndDescription" value="false"/>
   <f:entry title="${it.name}" description="${it.description}">
-    <div name="parameter" description="${it.description}" id='${paramName}'>
+    <div name="parameter" description="${h.escape(it.description)}" id='${paramName}'>
       <input type="hidden" name="name" value="${it.name}" />
       <j:choose>
         <j:when test="${choiceType eq 'PT_SINGLE_SELECT'}">