diff --git a/themes/grav/templates/forms/fields/markdown/markdown.html.twig b/themes/grav/templates/forms/fields/markdown/markdown.html.twig
index 4c5363b7..ae0ac595 100644
--- a/themes/grav/templates/forms/fields/markdown/markdown.html.twig
+++ b/themes/grav/templates/forms/fields/markdown/markdown.html.twig
@@ -1,7 +1,15 @@
 {% set value = (value is null ? field.default : value) %}
 
-<div class="form-field">
-    <div class="form-data form-markdown-wrapper cm-s-paper">
-        <textarea data-grav-mdeditor="{{ { 'markdown': true }|json_encode|e('html_attr') }}" name="{{ (scope ~ field.name)|fieldName }}" data-grav-urlpreview="{{ base_url }}/media/{{ admin.route|trim('/') }}.json">{{ value|join("\n")|e('html') }}</textarea>
+{% block label %}
+    {% if field.label %}
+        {% set hint = field.help ? 'data-hint="' ~ field.help ~ '"': '' %}
+        <div class="form-label form-field hint--bottom" {{ hint }}>{{ field.label }}</div>
+    {% endif %}
+{% endblock %}
+{% block field %}
+    <div class="form-field">
+        <div class="form-data form-markdown-wrapper cm-s-paper">
+            <textarea data-grav-mdeditor="{{ { 'markdown': true }|json_encode|e('html_attr') }}" name="{{ (scope ~ field.name)|fieldName }}" data-grav-urlpreview="{{ base_url }}/media/{{ admin.route|trim('/') }}.json">{{ value|join("\n")|e('html') }}</textarea>
+        </div>
     </div>
-</div>
+{% endblock %}
\ No newline at end of file