diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php
index bdf5f49..28c45a3 100644
--- a/core/lib/Drupal/Core/Entity/EntityManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -617,9 +617,13 @@ public function getAllBundleInfo() {
    *   An array of entity type labels, keyed by entity type name.
    */
   public function getEntityTypeLabels() {
-    $options = array();
+    $options = array(t('Content') => array(), t('Configuration') => array());
     foreach ($this->getDefinitions() as $entity_type => $definition) {
-      $options[$entity_type] = $definition['label'];
+      $group = t('Content');
+      if (isset($definition['config_prefix'])) {
+        $group = t('Configuration');
+      }
+      $options[$group][$entity_type] = $definition['label'];
     }
 
     return $options;