diff --git a/core/modules/system/templates/entity.html.twig b/core/modules/system/templates/entity.html.twig
index bb87837..e2b1d22 100644
--- a/core/modules/system/templates/entity.html.twig
+++ b/core/modules/system/templates/entity.html.twig
@@ -38,16 +38,16 @@
 <article{{ attributes }}>
 
   {#
-  In the full view mode the entity label is assumed to be displayed as the page
-  title, so we do not display it here.
+    In the 'full' view mode the entity label is assumed to be displayed as the
+    page title, so we do not display it here.
   #}
-  {% if label and view_mode != "full" %}
-    {{ title_prefix }}
+  {{ title_prefix }}
+  {% if label and view_mode != 'full' %}
     <h2{{ title_attributes }}>
       {{ label }}
     </h2>
-    {{ title_suffix }}
   {% endif %}
+  {{ title_suffix }}
 
   <div{{ content_attributes }}>
     {{ content }}
diff --git a/core/themes/stable/templates/content/entity.html.twig b/core/themes/stable/templates/content/entity.html.twig
index 0db7c8a..fb8478d 100644
--- a/core/themes/stable/templates/content/entity.html.twig
+++ b/core/themes/stable/templates/content/entity.html.twig
@@ -37,13 +37,13 @@
 #}
 <article{{ attributes }}>
 
-  {% if label and view_mode != "full" %}
-    {{ title_prefix }}
+  {{ title_prefix }}
+  {% if label and view_mode != 'full' %}
     <h2{{ title_attributes }}>
       {{ label }}
     </h2>
-    {{ title_suffix }}
   {% endif %}
+  {{ title_suffix }}
 
   <div{{ content_attributes }}>
     {{ content }}