diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/single_field_panel.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/single_field_panel.html
index 792d6afcf..5a479eb66 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/single_field_panel.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/single_field_panel.html
@@ -1,27 +1,8 @@
-{% load wagtailadmin_tags %}
 <fieldset>
     <legend>{{ self.heading }}</legend>
     <ul class="fields">
         <li>
-            {# render field with markup as per wagtailadmin/shared/field.html, but with label/help text omitted (those are handled by object_list.html) #}
-            <div class="field {{ field|fieldtype }} {{ field|widgettype }}">
-                <div class="field-content">
-                    <div class="input">
-                        {{ field|render_with_errors }}
-
-                        {# This span only used on rare occasions by certain types of input #}
-                        <span></span>
-                    </div>
-
-                    {% if field|has_unrendered_errors %}
-                        <p class="error-message">
-                            {% for error in field.errors %}
-                                <span>{{ error|escape }}</span>
-                            {% endfor %}
-                        </p>
-                    {% endif %}
-                </div>
-            </div>
+            {% include "wagtailadmin/shared/field.html" with show_label=False show_help_text=False %}
         </li>
     </ul>
 </fieldset>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field.html
index 0a87112ad..b98c5d2ec 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field.html
@@ -1,6 +1,6 @@
 {% load wagtailadmin_tags %}
 <div class="field {{ field|fieldtype }} {{ field|widgettype }} {{ field_classes }}">
-    {{ field.label_tag }}
+    {% if show_label|default_if_none:True %}{{ field.label_tag }}{% endif %}
     <div class="field-content">
         <div class="input {{ input_classes }} ">
             {% block form_field %}
@@ -10,7 +10,7 @@
             {# This span only used on rare occasions by certain types of input #}
             <span></span>
         </div>
-        {% if field.help_text %}
+        {% if show_help_text|default_if_none:True and field.help_text %}
             <p class="help">{{ field.help_text }}</p>
         {% endif %}