diff --git a/core/modules/block_content/block_content.routing.yml b/core/modules/block_content/block_content.routing.yml
index 3542ca8..8e4f649 100644
--- a/core/modules/block_content/block_content.routing.yml
+++ b/core/modules/block_content/block_content.routing.yml
@@ -76,7 +76,6 @@ entity.block_content_type.edit_form:
   path: '/admin/structure/block/block-content/manage/{block_content_type}'
   defaults:
     _entity_form: 'block_content_type.edit'
-    _title: 'Edit'
   requirements:
     _entity_access: 'block_content_type.update'
 
diff --git a/core/modules/block_content/src/BlockContentTypeForm.php b/core/modules/block_content/src/BlockContentTypeForm.php
index 30a17ec..74473cf 100644
--- a/core/modules/block_content/src/BlockContentTypeForm.php
+++ b/core/modules/block_content/src/BlockContentTypeForm.php
@@ -26,6 +26,13 @@ public function form(array $form, FormStateInterface $form_state) {
     /* @var \Drupal\block_content\BlockContentTypeInterface $block_type */
     $block_type = $this->entity;
 
+    if ($this->operation == 'add') {
+      $form['#title'] = $this->t('Add custom block type');
+    }
+    else {
+      $form['#title'] = $this->t('Edit %label custom block type', array('%label' => $block_type->label()));
+    }
+
     $form['label'] = array(
       '#type' => 'textfield',
       '#title' => t('Label'),