diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Controller/FieldUIController.php b/core/modules/field_ui/lib/Drupal/field_ui/Controller/FieldUIController.php
index 0246d2d..49687e5 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Controller/FieldUIController.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Controller/FieldUIController.php
@@ -61,7 +61,7 @@ public static function create(ContainerInterface $container) {
    *   A HTML-formatted string with the administrative page content.
    */
   public function fieldsList() {
-    $instances = $this->fieldInfo->getFieldMap();
+    $instances = $this->fieldInfo->getInstances();
     $field_types = field_info_field_types();
     $bundles = entity_get_bundles();
     $entity_manager = $this->entityManager;
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php
index 3b49b57..3d459cd 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php
@@ -72,6 +72,7 @@ function testCRUDFields() {
     $this->updateField();
     $this->addExistingField();
     $this->cardinalitySettings();
+    $this->fieldListAdminPage();
   }
 
   /**
@@ -533,4 +534,12 @@ function testDeleteTaxonomyField() {
     $this->assertNull(field_info_field($this->field_name), 'Field was deleted.');
   }
 
+  /**
+   * Tests that the field list administration page operates correctly.
+   */
+  function fieldListAdminPage() {
+    $this->drupalGet('admin/reports/fields');
+    $this->assertText($this->field_name, 'Field name is displayed in field list.');
+    $this->assertTrue($this->assertLinkByHref('admin/structure/types/manage/' . $this->type . '/fields'), 'Link to content type using field is displayed in field list.');
+  }
 }