diff --git a/core/lib/Drupal/Core/Menu/menu.api.php b/core/lib/Drupal/Core/Menu/menu.api.php
index af33b32..b801abf 100644
--- a/core/lib/Drupal/Core/Menu/menu.api.php
+++ b/core/lib/Drupal/Core/Menu/menu.api.php
@@ -301,10 +301,12 @@ function hook_menu_links_discovered_alter(&$links) {
  *   as described above.
  * @param string $route_name
  *   The route name of the page.
+ * @param \Drupal\Core\Cache\CacheableMetadata $cacheable_metadata
+ *   The cacheability metadata.
  *
  * @ingroup menu
  */
-function hook_menu_local_tasks_alter(&$data, $route_name) {
+function hook_menu_local_tasks_alter(&$data, $route_name, \Drupal\Core\Cache\CacheableMetadata $cacheable_metadata) {
 
   // Add a tab linking to node/add to all pages.
   $data['tabs'][0]['node.add_page'] = array(
diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php
index 00ef836..55c5dd6 100644
--- a/core/modules/views_ui/src/ViewEditForm.php
+++ b/core/modules/views_ui/src/ViewEditForm.php
@@ -671,9 +671,9 @@ public function rebuildCurrentTab(ViewUI $view, AjaxResponse $response, $display
    */
   public function renderDisplayTop(ViewUI $view) {
     $display_id = $this->displayID;
-    $element['#theme_wrappers'][] = 'views_ui_container';
-    $element['#attributes']['class'] = array('views-display-top', 'clearfix');
-    $element['#attributes']['id'] = array('views-display-top');
+    //$element['#theme_wrappers'][] = 'views_ui_container';
+    //$element['#attributes']['class'] = array('views-display-top', 'clearfix');
+    //$element['#attributes']['id'] = array('views-display-top');
 
     // Extra actions for the display
     $element['extra_actions'] = array(
@@ -735,9 +735,10 @@ public function renderDisplayTop(ViewUI $view) {
       if ($display_id) {
         $tabs[$display_id]['#active'] = TRUE;
       }
-      $tabs['#prefix'] = '<h2 class="visually-hidden">' . $this->t('Secondary tabs') . '</h2><ul id = "views-display-menu-tabs" class="tabs secondary">';
-      $tabs['#suffix'] = '</ul>';
-      $element['tabs'] = $tabs;
+      // $tabs['#prefix'] = '<h2 class="visually-hidden">' . $this->t('Secondary tabs') . '</h2><ul id = "views-display-menu-tabs" class="tabs secondary">';
+      // $tabs['#suffix'] = '</ul>';
+      $element['#theme'] = 'menu_local_tasks';
+      $element['#secondary'] = $tabs;
     }
 
     // Buttons for adding a new display.
diff --git a/core/modules/views_ui/views_ui.links.task.yml b/core/modules/views_ui/views_ui.links.task.yml
index 91b8c87..8e753cb 100644
--- a/core/modules/views_ui/views_ui.links.task.yml
+++ b/core/modules/views_ui/views_ui.links.task.yml
@@ -23,8 +23,3 @@ views_ui.reports_fields:
   route_name: views_ui.reports_fields
   title: 'Used in views'
   base_route: entity.field_storage_config.collection
-
-entity.view.edit_form:
-  title: 'Edit'
-  route_name: entity.view.edit_form
-  base_route: entity.view.edit_form
diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module
index 60fdc51..ad15612 100644
--- a/core/modules/views_ui/views_ui.module
+++ b/core/modules/views_ui/views_ui.module
@@ -6,6 +6,8 @@
  */
 
 use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Link;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 use Drupal\views\ViewExecutable;
@@ -326,3 +328,25 @@ function views_ui_truncate($string, $length) {
 
   return $string;
 }
+
+/**
+ * Implements hook_menu_local_tasks_alter().
+ */
+function views_ui_menu_local_tasks_alter(&$data, $route_name, CacheableMetadata $cacheable_metadata) {
+  $cacheable_metadata->addCacheContexts(['route']);
+
+  if (in_array($route_name, ['entity.view.edit_form', 'entity.view.edit_display_form'])) {
+    /** @var \Drupal\views_ui\ViewUI $view */
+    $view = \Drupal::request()->attributes->get('view');
+
+    foreach ($view->get('display') as $display_id => $display) {
+      $data['tabs'][0]['display_' . $display_id] = array(
+        '#theme' => 'menu_local_task',
+        '#link' => [
+          'title' => $display['display_title'],
+          'url' => Url::fromRoute('entity.view.edit_display_form', ['view' => $view->id(), 'display_id' => $display_id]),
+        ],
+      );
+    }
+  }
+}