diff --git a/core/modules/views_ui/templates/views-ui-container.html.twig b/core/modules/views_ui/templates/views-ui-container.html.twig
index d45b158..e6943ca 100644
--- a/core/modules/views_ui/templates/views-ui-container.html.twig
+++ b/core/modules/views_ui/templates/views-ui-container.html.twig
@@ -4,7 +4,6 @@
  * Default theme implementation for a generic views UI container/wrapper.
  *
  * Available variables:
- * - attributes: HTML attributes to apply to the container element.
  * - children: The remaining elements such as dropbuttons and tabs.
  *
  * @see template_preprocess_views_ui_container()
@@ -12,4 +11,4 @@
  * @ingroup themeable
  */
 #}
-<div{{ attributes }}>{{ children }}</div>
+<div class="contextual-region">{{ children }}</div>
diff --git a/core/modules/views_ui/templates/views-ui-view-preview-section.html.twig b/core/modules/views_ui/templates/views-ui-view-preview-section.html.twig
index cfc840f..5ead1d3 100644
--- a/core/modules/views_ui/templates/views-ui-view-preview-section.html.twig
+++ b/core/modules/views_ui/templates/views-ui-view-preview-section.html.twig
@@ -7,6 +7,7 @@
  * - title: The human readable section title.
  * - links: A list of contextual links.
  * - content: The content for this section preview.
+ * - attributes: HTML attributes to apply to the container element.
  *
  * @see template_preprocess_views_ui_view_preview_section()
  *
@@ -15,6 +16,6 @@
 #}
 <h1 class="section-title">{{ title }}</h1>
 {% if links %}
-  <div class="contextual">{{ links }}</div>
+  <div {{ attributes }}>{{ links }}</div>
 {% endif %}
 <div class="preview-section">{{ content }}</div>
diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module
index 5dba4fe..2c9f5f8 100644
--- a/core/modules/views_ui/views_ui.module
+++ b/core/modules/views_ui/views_ui.module
@@ -137,7 +137,6 @@ function views_ui_preprocess_views_view(&$variables) {
           '#section' => $section,
           '#content' => $variables[$section],
           '#theme_wrappers' => array('views_ui_container'),
-          '#attributes' => array('class' => array('contextual-region')),
         );
       }
     }
diff --git a/core/modules/views_ui/views_ui.theme.inc b/core/modules/views_ui/views_ui.theme.inc
index f9b165a..d55d8c1 100644
--- a/core/modules/views_ui/views_ui.theme.inc
+++ b/core/modules/views_ui/views_ui.theme.inc
@@ -508,6 +508,12 @@ function template_preprocess_views_ui_view_preview_section(&$variables) {
   }
 
   if (isset($links)) {
+    $variables['attributes'] = array(
+      'class' => 'contextual',
+        // @todo Set data-contextual-id attribute here.  _contextual_links_to_id is private function
+//      'data-contextual-id' =>  _contextual_links_to_id($links),
+    );
+
     $build = array(
       '#theme' => 'links__contextual',
       '#links' => $links,