diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module
index 5bce9dd..e66da09 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(
diff --git a/core/modules/shortcut/src/Tests/ShortcutSetsTest.php b/core/modules/shortcut/src/Tests/ShortcutSetsTest.php
index 66713dc..8cea657 100644
--- a/core/modules/shortcut/src/Tests/ShortcutSetsTest.php
+++ b/core/modules/shortcut/src/Tests/ShortcutSetsTest.php
@@ -16,6 +16,13 @@
 class ShortcutSetsTest extends ShortcutTestBase {
 
   /**
+   * Enable field_ui to make sure it does not break overview pages.
+   *
+   * @var array
+   */
+  public static $modules = array('field_ui');
+
+  /**
    * Tests creating a shortcut set.
    */
   function testShortcutSetAdd() {