diff --git a/templates/database/data_dictionary/index.twig b/templates/database/data_dictionary/index.twig
index d1b1b221cb..885df1cad5 100644
--- a/templates/database/data_dictionary/index.twig
+++ b/templates/database/data_dictionary/index.twig
@@ -13,7 +13,8 @@
       <div>
         <h2>{{ table.name }}</h2>
         {% if table.comment is not empty %}
-          <p>{% trans 'Table comments:' %} <em>{{ table.comment }}</em></p>
+          {% trans 'Table comments:' %}
+          <em><pre>{{ table.comment }}</pre></em>
         {% endif %}
 
         <table class="table table-striped align-middle">
diff --git a/templates/table/structure/display_table_stats.twig b/templates/table/structure/display_table_stats.twig
index 544024df98..ad0e05a613 100644
--- a/templates/table/structure/display_table_stats.twig
+++ b/templates/table/structure/display_table_stats.twig
@@ -2,10 +2,8 @@
     <fieldset class="pma-fieldset">
         <legend>{% trans 'Information' %}</legend>
         {% if showtable['TABLE_COMMENT'] %}
-            <p>
-                <strong>{% trans 'Table comments:' %}</strong>
-                {{ showtable['TABLE_COMMENT'] }}
-            </p>
+            <strong>{% trans 'Table comments:' %}</strong>
+            <em><pre>{{ showtable['TABLE_COMMENT'] }}</pre></em>
         {% endif %}
         <a id="showusage"></a>