diff --git a/templates/columns_definitions/column_comment.twig b/templates/columns_definitions/column_comment.twig
index e5e7ca501b..7414e10a36 100644
--- a/templates/columns_definitions/column_comment.twig
+++ b/templates/columns_definitions/column_comment.twig
@@ -3,5 +3,5 @@
     name="field_comments[{{ column_number }}]"
     size="12"
     maxlength="{{ max_length }}"
-    value="{{ value }}"
+    value="{{ value|raw }}"
     class="textfield" />
diff --git a/templates/table/structure/display_structure.twig b/templates/table/structure/display_structure.twig
index 79875f6655..54595957d6 100644
--- a/templates/table/structure/display_structure.twig
+++ b/templates/table/structure/display_structure.twig
@@ -54,7 +54,7 @@
                         {{- field_name|raw -}}
                     </span>
                 {%- endset %}
-                {% set comments = comments_map[row['Field']]|e %}
+                {% set comments = comments_map[row['Field']] %}
             {% endif %}
 
             {% if primary and primary.hasColumn(field_name) %}