diff --git a/core/modules/block/lib/Drupal/block/BlockListController.php b/core/modules/block/lib/Drupal/block/BlockListController.php
index 32735e5..ed77cce 100644
--- a/core/modules/block/lib/Drupal/block/BlockListController.php
+++ b/core/modules/block/lib/Drupal/block/BlockListController.php
@@ -147,6 +147,7 @@ public function buildForm(array $form, array &$form_state) {
       '#type' => 'table',
       '#header' => array(
         t('Block'),
+        t('Category'),
         t('Region'),
         t('Weight'),
         t('Operations'),
@@ -159,11 +160,16 @@ public function buildForm(array $form, array &$form_state) {
     // Build blocks first for each region.
     foreach ($entities as $entity_id => $entity) {
       $definition = $entity->getPlugin()->getPluginDefinition();
+      $label = $entity->label();
+      if ($label != $definition['admin_label']) {
+        $label .= ' (' . $definition['admin_label'] . ')';
+      }
       $blocks[$entity->get('region')][$entity_id] = array(
-        'admin_label' => $definition['admin_label'],
+        'admin_label' => $label,
         'entity_id' => $entity_id,
         'weight' => $entity->get('weight'),
         'entity' => $entity,
+        'category' => $definition['category'],
       );
     }
 
@@ -229,6 +235,9 @@ public function buildForm(array $form, array &$form_state) {
               'class' => array('block'),
             ),
           );
+          $form['blocks'][$entity_id]['type'] = array(
+            '#markup' => $info['category'],
+          );
           $form['blocks'][$entity_id]['region-theme']['region'] = array(
             '#type' => 'select',
             '#default_value' => $region,