diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php
index b9bd00b..86afad1 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php
@@ -102,15 +102,15 @@ public function buildHeader() {
   public function buildRow(EntityInterface $entity) {
     $row = parent::buildRow($entity);
 
-    $row['label'] = array('data' => array(
-      '#markup' => check_plain($row['label']),
-    ));
-
     unset($row['id']);
     if (empty($this->weightKey)) {
       return $row;
     }
     // Override default values to markup elements.
+    $row['label'] = array('data' => array(
+      '#markup' => check_plain($row['label']),
+    ));
+
     $row['#attributes']['class'][] = 'draggable';
     $row['#weight'] = $entity->get($this->weightKey);
     // Add weight column.
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php
index 10b4e6b..71218e9 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php
@@ -97,7 +97,7 @@ function testList() {
       ),
     );
     $actual_items = $controller->buildRow($entity);
-    $this->assertIdentical($expected_items, $actual_items);//, 'Return value from buildRow matches expected.');
+    $this->assertIdentical($expected_items, $actual_items, 'Return value from buildRow matches expected.');
     // Test sorting.
     $storage_controller = $controller->getStorageController();
     $entity = $storage_controller->create(array(