diff --git a/core/modules/views_ui/js/views_ui.listing.js b/core/modules/views_ui/js/views_ui.listing.js
index 1dc807a0ad1..7d19cd498d2 100644
--- a/core/modules/views_ui/js/views_ui.listing.js
+++ b/core/modules/views_ui/js/views_ui.listing.js
@@ -12,7 +12,7 @@
    *
    * Text search input: input.views-filter-text
    * Target table:      input.views-filter-text[data-table]
-   * Source text:       .views-table-filter-text-source
+   * Source text:       [data-drupal-selector="views-table-filter-text-source"]
    *
    * @type {Drupal~behavior}
    *
@@ -30,7 +30,7 @@
 
         function showViewRow(index, row) {
           var $row = $(row);
-          var $sources = $row.find('.views-table-filter-text-source');
+          var $sources = $row.find('[data-drupal-selector="views-table-filter-text-source"]');
           var textMatch = $sources.text().toLowerCase().indexOf(query) !== -1;
           $row.closest('tr').toggle(textMatch);
         }
diff --git a/core/modules/views_ui/src/ViewListBuilder.php b/core/modules/views_ui/src/ViewListBuilder.php
index daf96aaa779..9cb427e39c9 100644
--- a/core/modules/views_ui/src/ViewListBuilder.php
+++ b/core/modules/views_ui/src/ViewListBuilder.php
@@ -103,9 +103,14 @@ class ViewListBuilder extends ConfigEntityListBuilder {
           'data' => array(
             '#plain_text' => $view->get('description'),
           ),
-          'class' => array('views-table-filter-text-source'),
+          'data-drupal-selector' => 'views-table-filter-text-source',
+        ),
+        'tag' => array(
+          'data' => array(
+            '#plain_text' => $view->get('tag'),
+          ),
+          'data-drupal-selector' => 'views-table-filter-text-source',
         ),
-        'tag' => $view->get('tag'),
         'path' => array(
           'data' => array(
             '#theme' => 'item_list',
diff --git a/core/modules/views_ui/templates/views-ui-view-info.html.twig b/core/modules/views_ui/templates/views-ui-view-info.html.twig
index fa32a0c68a7..483972f2bbc 100644
--- a/core/modules/views_ui/templates/views-ui-view-info.html.twig
+++ b/core/modules/views_ui/templates/views-ui-view-info.html.twig
@@ -9,7 +9,7 @@
  * @ingroup themeable
  */
 #}
-<h3 class="views-ui-view-title views-table-filter-text-source">{{ view.label }}</h3>
+<h3 class="views-ui-view-title" data-drupal-selector="views-table-filter-text-source">{{ view.label }}</h3>
 <div class="views-ui-view-displays">
   {% if displays %}
     {% trans %}
@@ -24,5 +24,5 @@
 </div>
 <div class="views-ui-view-machine-name">
   {{ 'Machine name:'|t }}
-  <span class="views-table-filter-text-source">{{ view.id }}</span>
+  <span data-drupal-selector="views-table-filter-text-source">{{ view.id }}</span>
 </div>
diff --git a/core/themes/stable/templates/admin/views-ui-view-info.html.twig b/core/themes/stable/templates/admin/views-ui-view-info.html.twig
index 13052340ff6..dc8f7609fe9 100644
--- a/core/themes/stable/templates/admin/views-ui-view-info.html.twig
+++ b/core/themes/stable/templates/admin/views-ui-view-info.html.twig
@@ -7,7 +7,7 @@
  * - displays: List of displays.
  */
 #}
-<h3 class="views-ui-view-title views-table-filter-text-source">{{ view.label }}</h3>
+<h3 class="views-ui-view-title" data-drupal-selector="views-table-filter-text-source">{{ view.label }}</h3>
 <div class="views-ui-view-displays">
   {% if displays %}
     {% trans %}
@@ -22,5 +22,5 @@
 </div>
 <div class="views-ui-view-machine-name">
   {{ 'Machine name:'|t }}
-  <span class="views-table-filter-text-source">{{ view.id }}</span>
+  <span data-drupal-selector="views-table-filter-text-source">{{ view.id }}</span>
 </div>