diff -u b/core/modules/views/templates/views-view-fields.html.twig b/core/modules/views/templates/views-view-fields.html.twig
--- b/core/modules/views/templates/views-view-fields.html.twig
+++ b/core/modules/views/templates/views-view-fields.html.twig
@@ -29,29 +29,21 @@
 #}
 {% for field in fields %}
   {{ field.separator }}
-
   {% if field.wrapper_element %}
     <{{ field.wrapper_element }} {{ field.wrapper_attributes }}>
   {% endif %}
-
-  {% if field.label %}
-    {% if field.label_element %}
-      <{{ field.label_element }} {{ field.label_attributes }}>
+    {% if field.label %}
+      {% if field.label_element %}
+        <{{ field.label_element }} {{ field.label_attributes }}>{{ field.label }}{{ field.label_suffix }}</{{ field.label_element }}>
+      {% else %}
+        {{ field.label }}{{ field.label_suffix }}
+      {% endif %}
     {% endif %}
-    {{ field.label }}{{ field.label_suffix }}
-    {% if field.label_element %}
-      </{{ field.label_element }}>
+    {% if field.element_type %}
+      <{{ field.element_type }} {{ field.element_attributes }}>{{ field.content }}</{{ field.element_type }}>
+    {% else %}
+      {{ field.content }}
     {% endif %}
-  {% endif %}
-
-  {% if field.element_type %}
-    <{{ field.element_type }} {{ field.element_attributes }}>
-  {% endif %}
-  {{ field.content }}
-  {% if field.element_type %}
-    </{{ field.element_type }}>
-  {% endif %}
-
   {% if field.wrapper_element %}
     </{{ field.wrapper_element }}>
   {% endif %}