diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php
index 6a55145..55f5296 100644
--- a/core/lib/Drupal/Core/Entity/EntityManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -958,20 +958,20 @@ protected function getDisplayModeOptionsByBundle($display_type, $entity_type_id,
     $config_prefix = $entity_type->getConfigPrefix();
 
     // Load all the entity's display modes.
-    $view_modes = $this->getDisplayModesByEntityType($display_type, $entity_type_id);
+    $display_modes = $this->getDisplayModesByEntityType($display_type, $entity_type_id);
 
     // Get the list of available display modes for the current block's bundle.
     $ids = $this->configFactory->listAll($config_prefix . '.' . $entity_type_id . '.' . $bundle);
     foreach ($ids as $id) {
       $load_ids[] = str_replace($config_prefix . '.', '', $id);
     }
-    $displays = entity_load_multiple('entity_view_display', $load_ids);
+    $displays = entity_load_multiple($display_type_entity_name, $load_ids);
 
     // Generate the display options array.
     foreach ($displays as $display) {
       if ($display->status() || $include_disabled) {
         $display_mode_name = $display->get('mode');
-        $display_mode_options[$display_mode_name] = ($display_mode_name == 'default') ? t('Default') : $view_modes[$display_mode_name]['label'];
+        $display_mode_options[$display_mode_name] = ($display_mode_name == 'default') ? t('Default') : $display_modes[$display_mode_name]['label'];
       }
     }