diff --git a/lib/Drupal/views/Tests/UI/SettingsTest.php b/lib/Drupal/views/Tests/UI/SettingsTest.php
index 07fde7cf088707a7387949960928fc4d430bdc95..faa92e1c08214a79eb285ecce584627deaf61c79 100644
--- a/lib/Drupal/views/Tests/UI/SettingsTest.php
+++ b/lib/Drupal/views/Tests/UI/SettingsTest.php
@@ -33,6 +33,10 @@ public static function getInfo() {
   function testEditUI() {
     $this->drupalLogin($this->adminUser);
 
+    // Test the settings tab exists.
+    $this->drupalGet('admin/structure/views');
+    $this->assertLinkByHref('admin/structure/views/settings');
+
     // Configure to always show the master display.
     $edit = array(
       'ui_show_master_display' => TRUE,
diff --git a/lib/Drupal/views/ViewListController.php b/lib/Drupal/views/ViewListController.php
index c3c723129ccb757482bf77c1f28b8a1701ad69c6..9b89b8103ea07d7849f0d2ba4a06a99ea03dd797 100644
--- a/lib/Drupal/views/ViewListController.php
+++ b/lib/Drupal/views/ViewListController.php
@@ -35,6 +35,13 @@ public function hookMenu() {
     $items[$path]['access callback'] = 'user_access';
     $items[$path]['access arguments'] = array('administer views');
 
+    // Add a default local task, so we have tabs.
+    $items["$path/list"] = array(
+      'title' => 'List',
+      'weight' => -10,
+      'type' => MENU_DEFAULT_LOCAL_TASK,
+    );
+
     // Set up the base for AJAX callbacks.
     $ajax_base = array(
       'page callback' => 'views_ui_listing_ajax_callback',