diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Access/FormModeAccessCheck.php b/core/modules/field_ui/lib/Drupal/field_ui/Access/FormModeAccessCheck.php
index 23920ee12ccb9c8b6c5f3c6a89e042aac9115bd9..10552da7d3975c1fd36f6bcfa1a0383c9ed20e9c 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Access/FormModeAccessCheck.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Access/FormModeAccessCheck.php
@@ -46,7 +46,7 @@ public function appliesTo() {
    * {@inheritdoc}
    */
   public function access(Route $route, Request $request, AccountInterface $account) {
-    if ($entity_type = $request->attributes->get('entity_type')) {
+    if ($entity_type = $route->getDefault('entity_type')) {
       $form_mode = $request->attributes->get('form_mode_name');
 
       if (!($bundle = $request->attributes->get('bundle'))) {
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Access/ViewModeAccessCheck.php b/core/modules/field_ui/lib/Drupal/field_ui/Access/ViewModeAccessCheck.php
index c1e653e840857c5fdc015c6b8716d679459e2d4f..e5fb8d541b4be6dc4bdddbf68fd0c48595352308 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Access/ViewModeAccessCheck.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Access/ViewModeAccessCheck.php
@@ -46,7 +46,7 @@ public function appliesTo() {
    * {@inheritdoc}
    */
   public function access(Route $route, Request $request, AccountInterface $account) {
-    if ($entity_type = $request->attributes->get('entity_type')) {
+    if ($entity_type = $route->getDefault('entity_type')) {
       $view_mode = $request->attributes->get('view_mode_name');
 
       if (!($bundle = $request->attributes->get('bundle'))) {
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUIRouteTest.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUIRouteTest.php
index d3764a4ea7331e89068df8da95db1065f8f17b06..b9ff9c0b342ca34aff660eb8b116e5edd97ddb91 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUIRouteTest.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUIRouteTest.php
@@ -52,6 +52,10 @@ public function testFieldUIRoutes() {
 
     $this->drupalGet('admin/structure/types/manage/article/fields');
     $this->assertTitle('Manage fields | Drupal');
+
+    $this->drupalGet('admin/structure/types/manage/article');
+    $this->assertLink('Manage display');
+    $this->assertLink('Manage form display');
   }
 
 }