diff --git a/theme/boost/templates/core_form/element-advcheckbox-inline.mustache b/theme/boost/templates/core_form/element-advcheckbox-inline.mustache
index d09c56cb8ef..94d2fd6f044 100644
--- a/theme/boost/templates/core_form/element-advcheckbox-inline.mustache
+++ b/theme/boost/templates/core_form/element-advcheckbox-inline.mustache
@@ -27,7 +27,7 @@
     <em>{{{.}}}</em>
 {{/text}}
 {{{helpbutton}}}
-<span class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{^error}} style="display: none;"{{/error}}>
+<span class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}>
     {{{error}}}
 </span>
 {{^element.frozen}}
diff --git a/theme/boost/templates/core_form/element-advcheckbox.mustache b/theme/boost/templates/core_form/element-advcheckbox.mustache
index 8c4f3fe7b57..8e1a472119f 100644
--- a/theme/boost/templates/core_form/element-advcheckbox.mustache
+++ b/theme/boost/templates/core_form/element-advcheckbox.mustache
@@ -43,7 +43,7 @@
                 {{{helpbutton}}}
             </span>
         </div>
-        <div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{^error}} style="display: none;"{{/error}}>
+        <div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}>
             {{{error}}}
         </div>
     </div>
diff --git a/theme/boost/templates/core_form/element-checkbox-inline.mustache b/theme/boost/templates/core_form/element-checkbox-inline.mustache
index 638a4d3afdb..279affb4137 100644
--- a/theme/boost/templates/core_form/element-checkbox-inline.mustache
+++ b/theme/boost/templates/core_form/element-checkbox-inline.mustache
@@ -27,7 +27,7 @@
     <em>{{{.}}}</em>
 {{/text}}
 {{{helpbutton}}}
-<span class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{^error}} style="display: none;"{{/error}}>
+<span class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}>
     {{{error}}}
 </span>
 {{^element.frozen}}
diff --git a/theme/boost/templates/core_form/element-checkbox.mustache b/theme/boost/templates/core_form/element-checkbox.mustache
index a66472c1255..9277f0b79d1 100644
--- a/theme/boost/templates/core_form/element-checkbox.mustache
+++ b/theme/boost/templates/core_form/element-checkbox.mustache
@@ -43,7 +43,7 @@
                 {{{helpbutton}}}
             </span>
         </div>
-        <div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{^error}} style="display: none;"{{/error}}>
+        <div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}>
             {{{error}}}
         </div>
     </div>
diff --git a/theme/boost/templates/core_form/element-radio-inline.mustache b/theme/boost/templates/core_form/element-radio-inline.mustache
index 95e04c37839..bac7a26d627 100644
--- a/theme/boost/templates/core_form/element-radio-inline.mustache
+++ b/theme/boost/templates/core_form/element-radio-inline.mustache
@@ -28,7 +28,7 @@
     <em>{{{.}}}</em>
 {{/text}}
 {{{helpbutton}}}
-<span class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{^error}} style="display: none;"{{/error}}>
+<span class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}>
     {{{error}}}
 </span>
 {{^element.frozen}}
diff --git a/theme/boost/templates/core_form/element-radio.mustache b/theme/boost/templates/core_form/element-radio.mustache
index e6b5642931a..01d9cec42fa 100644
--- a/theme/boost/templates/core_form/element-radio.mustache
+++ b/theme/boost/templates/core_form/element-radio.mustache
@@ -19,30 +19,32 @@
         {{/text}}
     </div>
     <div class="col-md-9 checkbox">
-        <label class="form-check-label">
-        {{^element.hardfrozen}}{{#element.frozen}}{{#element.checked}}
-            <input type="hidden" name="{{element.name}}" value="{{element.value}}">
-        {{/element.checked}}{{/element.frozen}}{{/element.hardfrozen}}
-        <input type="radio" class="form-check-input" {{^element.frozen}}name="{{element.name}}"{{/element.frozen}}
-            id="{{element.id}}" value="{{element.value}}"
-            {{#element.checked}}checked{{/element.checked}}
-            {{#element.frozen}}disabled{{/element.frozen}}
-            {{#error}}
-                autofocus aria-describedby="id_error_{{element.name}}"
-            {{/error}} {{{element.attributes}}} >
-        {{#text}}
-            {{{.}}}
-        {{/text}}
-        {{^text}}
-            {{{label}}}
-        {{/text}}
-        </label>
+        <div class="form-check">
+            <label class="form-check-label">
+            {{^element.hardfrozen}}{{#element.frozen}}{{#element.checked}}
+                <input type="hidden" name="{{element.name}}" value="{{element.value}}">
+            {{/element.checked}}{{/element.frozen}}{{/element.hardfrozen}}
+            <input type="radio" class="form-check-input" {{^element.frozen}}name="{{element.name}}"{{/element.frozen}}
+                id="{{element.id}}" value="{{element.value}}"
+                {{#element.checked}}checked{{/element.checked}}
+                {{#element.frozen}}disabled{{/element.frozen}}
+                {{#error}}
+                    autofocus aria-describedby="id_error_{{element.name}}"
+                {{/error}} {{{element.attributes}}} >
+            {{#text}}
+                {{{.}}}
+            {{/text}}
+            {{^text}}
+                {{{label}}}
+            {{/text}}
+            </label>
+        </div>
         <span class="text-nowrap">
             {{#required}}<abbr class="initialism text-danger" title="{{#str}}required{{/str}}">{{#pix}}req, core, {{#str}}required{{/str}}{{/pix}}</abbr>{{/required}}
             {{#advanced}}<abbr class="initialism text-info" title="{{#str}}advanced{{/str}}">!</abbr>{{/advanced}}
             {{{helpbutton}}}
         </span>
-         <div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{^error}} style="display: none;"{{/error}}>
+         <div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}>
             {{{error}}}
         </div>
     </div>
diff --git a/theme/boost/templates/core_form/element-template-inline.mustache b/theme/boost/templates/core_form/element-template-inline.mustache
index 35ce030d17b..98ec035ae8f 100644
--- a/theme/boost/templates/core_form/element-template-inline.mustache
+++ b/theme/boost/templates/core_form/element-template-inline.mustache
@@ -9,7 +9,7 @@
             <!-- Element goes here -->
         {{/ element }}
     </span>
-    <div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{^error}} style="display: none;"{{/error}}>
+    <div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}>
         {{{error}}}
     </div>
 </div>