diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php
index bdf5f49..46f2bf6 100644
--- a/core/lib/Drupal/Core/Entity/EntityManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -614,15 +614,28 @@ public function getAllBundleInfo() {
    * Builds a list of entity type labels suitable for a Form API options list.
    *
    * @return array
-   *   An array of entity type labels, keyed by entity type name.
+   *   An array of which the keys are human-readable labels of entity groups.
+   *   Values are arrays of which the keys are entity type IDs and values are
+   *   human-readable entity type labels.
    */
   public function getEntityTypeLabels() {
-    $options = array();
-    foreach ($this->getDefinitions() as $entity_type => $definition) {
-      $options[$entity_type] = $definition['label'];
+    $content_labels = array();
+    $config_labels = array();
+    foreach ($this->getDefinitions() as $entity_type => $entity_info) {
+      if (is_subclass_of($entity_info['class'], 'Drupal\Core\Config\Entity\ConfigEntityInterface')) {
+        $config_labels[$entity_type] = $entity_info['label'];
+      }
+      else {
+        $content_labels[$entity_type] = $entity_info['label'];
+      }
     }
+    natcasesort($content_labels);
+    natcasesort($config_labels);
 
-    return $options;
+    return array(
+      t('Content') => $content_labels,
+      t('Configuration') => $config_labels,
+    );
   }
 
 }