diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/stream_member.html b/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/stream_member.html
index 390ed18bd1..9c69f01aee 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/stream_member.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/stream_member.html
@@ -7,7 +7,7 @@
 
 {% block header_controls %}
     <div class="stream-controls">
-        <h3>{{ block_type_name }}</h3>{# TODO: this should be the label, not the name, the latter being a machine-name #}
+        <h3><label{% if child.id_for_label %} for="{{ child.id_for_label }}"{% endif %}>{{ child.block.label }}</label></h3>
         <div class="buttons">
             <button type="button" id="{{ prefix }}-moveup" title="{% trans 'Move up' %}" class="icon button-nobg button-neutral text-replace icon-order-up">{% trans 'Move up' %}</button>
             <button type="button" id="{{ prefix }}-movedown" title="{% trans 'Move down' %}" class="icon button-nobg button-neutral text-replace icon-order-down">{% trans 'Move down' %}</button>
diff --git a/wagtail/wagtailcore/blocks/base.py b/wagtail/wagtailcore/blocks/base.py
index a1fa802751..e8d0debced 100644
--- a/wagtail/wagtailcore/blocks/base.py
+++ b/wagtail/wagtailcore/blocks/base.py
@@ -379,6 +379,9 @@ class BoundBlock(object):
     def render(self):
         return self.block.render(self.value)
 
+    def id_for_label(self):
+        return self.block.id_for_label(self.prefix)
+
 
 class DeclarativeSubBlocksMetaclass(BaseBlock):
     """