diff --git a/templates/default/invoice/invoicecontents.html b/templates/default/invoice/invoicecontents.html
index 2de9e7d10d..8da7bc97ef 100644
--- a/templates/default/invoice/invoicecontents.html
+++ b/templates/default/invoice/invoicecontents.html
@@ -107,7 +107,7 @@
                 <INPUT TYPE="text" class="invoice-contents-field-edit" NAME="invoice-contents[{$posuid}][name]" SIZE="40" style="width: 300px; display: none;"
                        value="{$row.name|escape}" data-old-value="{$item.name|escape}"
                        {tip text="Enter description"}>
-                <span class="invoice-contents-field-value">{$item.name}</span>
+                <span class="invoice-contents-field-value">{$item.name|escape}</span>
                 {if isset($item.name_custom_contents)}
                     {$item.name_custom_contents}
                 {/if}
diff --git a/templates/default/invoice/invoicenew.html b/templates/default/invoice/invoicenew.html
index 9cd155bc92..60a9c0a3c3 100644
--- a/templates/default/invoice/invoicenew.html
+++ b/templates/default/invoice/invoicenew.html
@@ -238,7 +238,7 @@ <H1>{$layout.pagetitle}</H1>
 			{section name=covenantlist loop=$covenantlist}
 				<TR class="highlight {cycle}">
 					<TD class="nobr">{$covenantlist[covenantlist].time|date_format:"%Y/%m/%d"}</TD>
-					<TD>{$covenantlist[covenantlist].comment}</TD>
+					<TD>{$covenantlist[covenantlist].comment|escape}</TD>
 					<td>
 						{tax_category_selection elementname="l_taxcategory[{$covenantlist[covenantlist].cashid}]"
 							tip="Select tax category"}
diff --git a/templates/default/invoice/invoicenotemodify.html b/templates/default/invoice/invoicenotemodify.html
index a38f6693f5..781c91da59 100644
--- a/templates/default/invoice/invoicenotemodify.html
+++ b/templates/default/invoice/invoicenotemodify.html
@@ -316,7 +316,7 @@ <H1>{$layout.pagetitle}</H1>
 			</TD>
 			<TD>
 				{if $item.deleted}
-					<INPUT TYPE="hidden" VALUE="{$item.name|escape}" NAME="name[{$itemid}]">{$item.name}
+					<INPUT TYPE="hidden" VALUE="{$item.name|escape}" NAME="name[{$itemid}]">{$item.name|escape}
 				{else}
 					<INPUT TYPE="text" VALUE="{$item.name|escape}" NAME="name[{$itemid}]" SIZE="48">
 				{/if}