From b79a4bc4119ccc96bc0731acfd56fb97898fce1c Mon Sep 17 00:00:00 2001
From: webchick <drupal@webchick.net>
Date: Wed, 1 Oct 2014 01:18:24 -0700
Subject: [PATCH] Issue #2346969 by Berdir, damiankloip: Fixed Shortcut
 overview page is sad.

---
 core/modules/field_ui/field_ui.module | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module
index 5bce9dd64d3d..e66da090bc87 100644
--- a/core/modules/field_ui/field_ui.module
+++ b/core/modules/field_ui/field_ui.module
@@ -148,8 +148,9 @@ function field_ui_entity_operation(EntityInterface $entity) {
   $operations = array();
   $info = $entity->getEntityType();
   // Add manage fields and display links if this entity type is the bundle
-  // of another.
-  if ($bundle_of = $info->getBundleOf()) {
+  // of another and that type has field UI enabled.
+  $entity_manager = \Drupal::entityManager();
+  if (($bundle_of = $info->getBundleOf()) && $entity_manager->getDefinition($bundle_of)->get('field_ui_base_route')) {
     $account = \Drupal::currentUser();
     if ($account->hasPermission('administer '. $bundle_of . ' fields')) {
       $operations['manage-fields'] = array(