diff --git a/core/modules/tour/tour.module b/core/modules/tour/tour.module
index 689d6d0..af7ffc3 100644
--- a/core/modules/tour/tour.module
+++ b/core/modules/tour/tour.module
@@ -110,15 +110,12 @@ function tour_preprocess_page(&$variables) {
   }
 
   // Load all of the items and match on route name.
-  $query = \Drupal::service('entity.query')->get('tour');
   $route_name = \Drupal::request()->attributes->get(RouteObjectInterface::ROUTE_NAME);
-  $results = $query->condition('routes.*', $route_name)
+  $results = \Drupal::entityQuery('tour')
+    ->condition('routes.*', $route_name)
     ->execute();
-  if (!empty($results)) {
-    $tours = entity_load_multiple('tour', array_keys($results));
-    if ($tours) {
-      $variables['page']['help']['tour'] = entity_view_multiple($tours, 'full');
-    }
+  if (!empty($results) && $tours = entity_load_multiple('tour', array_keys($results))) {
+    $variables['page']['help']['tour'] = entity_view_multiple($tours, 'full');
   }
 }
 
diff --git a/core/modules/views_ui/config/tour.tour.views-ui.yml b/core/modules/views_ui/config/tour.tour.views-ui.yml
index 70e0eb5..8e2ec3e 100644
--- a/core/modules/views_ui/config/tour.tour.views-ui.yml
+++ b/core/modules/views_ui/config/tour.tour.views-ui.yml
@@ -5,6 +5,7 @@ label: 'Views ui'
 langcode: en
 routes:
   - views_ui.edit
+  - views_ui.edit_display
 tips:
   views-ui-active-display:
     id: views-ui-active-display