diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php
index 3357320..1fbde7a 100644
--- a/core/lib/Drupal/Core/Entity/EntityManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -424,13 +424,13 @@ public function getEntityTypeLabels($group = FALSE) {
     ksort($definitions);
 
     foreach ($definitions as $entity_type => $definition) {
-      // Ensure that Content entities are floated to the top of lists.
-      if ($definition instanceof ContentEntityType ) {
-        $content_options[$entity_type] = $definition->getLabel();
-        continue;
-      }
       if ($group) {
         $group_label = $definition->getGroupLabel() ?: \Drupal::translation()->translate('Other', array(), array('context' => 'Entity type group'));
+        // Ensure that Content entities are floated to the top of lists.
+        if ($definition instanceof ContentEntityType) {
+          $content_options[$group_label][$entity_type] = $definition->getLabel();
+          continue;
+        }
         $options[$group_label][$entity_type] = $definition->getLabel();
       }
       else {