diff --git a/core/modules/views_ui/src/Tests/ViewsListFormWebTest.php b/core/modules/views_ui/src/Tests/ViewsListFormWebTest.php
new file mode 100644
index 0000000..9d2c5ad
--- /dev/null
+++ b/core/modules/views_ui/src/Tests/ViewsListFormWebTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views_ui\Tests\ViewsListFormWebTest.
+ */
+
+namespace Drupal\views_ui\Tests;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests the search/filter form on top of the views list
+ *
+ * @group views_ui
+ */
+class ViewsListFormWebTest extends WebTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('system_test', 'views_ui');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    \Drupal::state()->set('system_test.module_hidden', FALSE);
+  }
+
+  /**
+   * Tests the views list form.
+   */
+  public function testViewsListForm() {
+    $this->drupalLogin($this->drupalCreateUser(array('administer views')));
+    $this->drupalGet('admin/structure/views');
+    $this->assertResponse('200');
+
+    // Ensure expected markup and values for the search/filter inut field
+    $this->assertFieldByXPath("//input[contains(@class, 'views-filter-text')]");
+    $this->assertFieldByXPath("//input[contains(@size, '40')]");
+    $this->assertFieldByXPath("//input[contains(@type, 'search')]");
+    $this->assertFieldByXPath("//input[contains(@title, 'Enter a part of the view name or description to filter by.')]");
+    $this->assertFieldByXPath("//input[contains(@placeholder, 'Filter by view name or description')]");
+  }
+}
+
+
diff --git a/core/modules/views_ui/src/ViewListBuilder.php b/core/modules/views_ui/src/ViewListBuilder.php
index f9ac0e1..3da8fd7 100644
--- a/core/modules/views_ui/src/ViewListBuilder.php
+++ b/core/modules/views_ui/src/ViewListBuilder.php
@@ -186,9 +186,10 @@ public function render() {

     $list['filters']['text'] = array(
       '#type' => 'search',
-      '#title' => $this->t('Search'),
-      '#size' => 30,
-      '#placeholder' => $this->t('Enter view name'),
+      '#title' => $this->t('Filter'),
+      '#title_display' => 'invisible',
+      '#size' => 40,
+      '#placeholder' => $this->t('Filter by view name or description'),
       '#attributes' => array(
         'class' => array('views-filter-text'),
         'data-table' => '.views-listing-table',