diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php
index a54beac..52e2f30 100644
--- a/core/lib/Drupal/Core/Entity/EntityManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -423,6 +423,11 @@ 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'));
         $options[$group_label][$entity_type] = $definition->getLabel();
@@ -434,10 +439,10 @@ public function getEntityTypeLabels($group = FALSE) {
 
     if ($group) {
       // Sort the list alphabetically by group label.
-      array_multisort($options, SORT_DESC);
+     array_multisort($options, SORT_DESC);
     }
 
-    return $options;
+    return array_merge($content_options, $options);
   }
 
   /**