diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php
index fbb10c0b3e0b918f7d29cafe81c041aacb124f15..4ef6911978403f77734b2c94cb77db930b4d964b 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php
@@ -20,7 +20,7 @@ class ConfigEntityListController extends EntityListController {
    */
   public function load() {
     $entities = parent::load();
-    uasort($entities, 'Drupal\Core\Config\Entity\ConfigEntityBase::sort');
+    uasort($entities, array($this->entityInfo['class'], 'sort'));
     return $entities;
   }
 
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php
index 17b3af6bda0a527ade50f9675e10d212067c0f3d..0d29ac3eae5db7597364d9f375cd50c1f4d67191 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php
@@ -145,6 +145,9 @@ function testListUI() {
     $edit = array('label' => 'Antelope', 'id' => 'antelope');
     $this->drupalPost(NULL, $edit, t('Save'));
 
+    // Ensure that the entity's sort method was called.
+    $this->assertTrue(state()->get('config_entity_sort'), 'ConfigTest::sort() was called.');
+
     // Confirm that the user is returned to the listing, and verify that the
     // text of the label and machine name appears in the list (versus elsewhere
     // on the page).
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigTest.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigTest.php
index bfcede55b70e53a7717d9387d9784fa03d806a99..5e165d51bc1874997948fd59e5888ee6792a966d 100644
--- a/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigTest.php
+++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigTest.php
@@ -84,4 +84,12 @@ public function getExportProperties() {
     return $properties;
   }
 
+  /**
+   * Overrides \Drupal\Core\Config\Entity\ConfigEntityBase::sort().
+   */
+  public static function sort($a, $b) {
+    state()->set('config_entity_sort', TRUE);
+    return parent::sort($a, $b);
+  }
+
 }