diff --git a/core/modules/system/templates/datetime-wrapper.html.twig b/core/modules/system/templates/datetime-wrapper.html.twig
index 443b5b3..b10d306 100644
--- a/core/modules/system/templates/datetime-wrapper.html.twig
+++ b/core/modules/system/templates/datetime-wrapper.html.twig
@@ -24,6 +24,11 @@
   <h4{{ title_attributes.addClass(title_classes) }}>{{ title }}</h4>
 {% endif %}
 {{ content }}
+{% if errors %}
+  <div>
+    {{ errors }}
+  </div>
+{% endif %}
 {% if description %}
   <div>{{ description }}</div>
 {% endif %}
diff --git a/core/modules/system/templates/fieldset.html.twig b/core/modules/system/templates/fieldset.html.twig
index cf4e6fa..aace950 100644
--- a/core/modules/system/templates/fieldset.html.twig
+++ b/core/modules/system/templates/fieldset.html.twig
@@ -23,11 +23,6 @@
  */
 #}
 <fieldset{{ attributes.addClass('form-item', 'form-wrapper') }}>
-  {% if errors %}
-    <div class="form-error-message">
-      <strong>{{ errors }}</strong>
-    </div>
-  {% endif %}
   {%
     set legend_span_classes = [
       'fieldset-legend',
@@ -39,6 +34,11 @@
     <span{{ legend_span.attributes.addClass(legend_span_classes) }}>{{ legend.title }}</span>
   </legend>
   <div class="fieldset-wrapper">
+    {% if errors %}
+      <div>
+        {{ errors }}
+      </div>
+    {% endif %}
     {% if prefix %}
       <span class="field-prefix">{{ prefix }}</span>
     {% endif %}
diff --git a/core/modules/system/templates/form-element.html.twig b/core/modules/system/templates/form-element.html.twig
index f9148c8..501368b 100644
--- a/core/modules/system/templates/form-element.html.twig
+++ b/core/modules/system/templates/form-element.html.twig
@@ -63,11 +63,6 @@
   ]
 %}
 <div{{ attributes.addClass(classes) }}>
-  {% if errors %}
-    <div class="form-error-message">
-      <strong>{{ errors }}</strong>
-    </div>
-  {% endif %}
   {% if label_display in ['before', 'invisible'] %}
     {{ label }}
   {% endif %}
@@ -86,6 +81,11 @@
   {% if label_display == 'after' %}
     {{ label }}
   {% endif %}
+  {% if errors %}
+    <div class="form-error-message">
+      {{ errors }}
+    </div>
+  {% endif %}
   {% if description_display in ['after', 'invisible'] and description.content %}
     <div{{ description.attributes.addClass(description_classes) }}>
       {{ description.content }}