diff --git a/core/modules/field_ui/src/DisplayOverview.php b/core/modules/field_ui/src/DisplayOverview.php
index 7552154..7036271 100644
--- a/core/modules/field_ui/src/DisplayOverview.php
+++ b/core/modules/field_ui/src/DisplayOverview.php
@@ -206,8 +206,10 @@ protected function getTableHeader() {
    * {@inheritdoc}
    */
   protected function getOverviewRoute($mode) {
+    $entity_type = $this->entityManager->getDefinition($this->entity_type);
+    $field_entity_type = $entity_type->getBundleEntityType() != 'bundle'?  $entity_type->getBundleEntityType() : $entity_type->id();
     return array(
-      'route_name' => 'field_ui.display_overview_view_mode_' . $this->bundleEntityType,
+      'route_name' => 'field_ui.display_overview_view_mode_' . $field_entity_type,
       'route_parameters' => array(
         $this->bundleEntityType => $this->bundle,
         'view_mode_name' => $mode,
diff --git a/core/modules/field_ui/src/FormDisplayOverview.php b/core/modules/field_ui/src/FormDisplayOverview.php
index d383b06..40d966a 100644
--- a/core/modules/field_ui/src/FormDisplayOverview.php
+++ b/core/modules/field_ui/src/FormDisplayOverview.php
@@ -171,8 +171,10 @@ protected function getTableHeader() {
    * {@inheritdoc}
    */
   protected function getOverviewRoute($mode) {
+    $entity_type = $this->entityManager->getDefinition($this->entity_type);
+    $field_entity_type = $entity_type->getBundleEntityType() != 'bundle'?  $entity_type->getBundleEntityType() : $entity_type->id();
     return array(
-      'route_name' => 'field_ui.form_display_overview_form_mode_' . $this->bundleEntityType,
+      'route_name' => 'field_ui.form_display_overview_form_mode_' . $field_entity_type,
       'route_parameters' => array(
         $this->bundleEntityType => $this->bundle,
         'form_mode_name' => $mode,
diff --git a/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php b/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php
index aac7bdc..fd98062 100644
--- a/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php
+++ b/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php
@@ -70,7 +70,6 @@ public function getDerivativeDefinitions($base_plugin_definition) {
 
     foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
       if ($entity_type->isFieldable() && $entity_type->get('field_ui_base_route')) {
-        $field_entity_type = $entity_type->getBundleEntityType() ?: $entity_type_id;
         $field_entity_type = $entity_type->getBundleEntityType() != 'bundle'?  $entity_type->getBundleEntityType() : $entity_type_id;
 
         $this->derivatives["overview_$field_entity_type"] = array(