diff --git a/src/wp-admin/css/themes.css b/src/wp-admin/css/themes.css
index f12fea63ea..24f50fc51b 100644
--- a/src/wp-admin/css/themes.css
+++ b/src/wp-admin/css/themes.css
@@ -20,7 +20,7 @@
 }
 
 /* Search form */
-.themes-php .wp-filter-search-form {
+.themes-php .search-form {
 	display: inline;
 }
 
diff --git a/src/wp-admin/js/theme.js b/src/wp-admin/js/theme.js
index ea9ae00c27..39ed26ad94 100644
--- a/src/wp-admin/js/theme.js
+++ b/src/wp-admin/js/theme.js
@@ -83,7 +83,7 @@ themes.view.Appearance = wp.Backbone.View.extend({
 	},
 
 	// Defines search element container
-	searchContainer: $( '.wp-filter-search-form' ),
+	searchContainer: $( '.search-form' ),
 
 	// Search input and view
 	// for current theme collection
diff --git a/src/wp-admin/theme-install.php b/src/wp-admin/theme-install.php
index b3eff07ae8..eb956f4380 100644
--- a/src/wp-admin/theme-install.php
+++ b/src/wp-admin/theme-install.php
@@ -164,7 +164,7 @@ include(ABSPATH . 'wp-admin/admin-header.php');
 
 		<button type="button" class="button drawer-toggle" aria-expanded="false"><?php _e( 'Feature Filter' ); ?></button>
 
-		<div class="search-form"></div>
+		<form class="search-form"></form>
 
 		<div class="favorites-form">
 			<?php
diff --git a/src/wp-admin/themes.php b/src/wp-admin/themes.php
index a7c6596171..b73cd166d5 100644
--- a/src/wp-admin/themes.php
+++ b/src/wp-admin/themes.php
@@ -160,7 +160,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 		<a href="<?php echo admin_url( 'theme-install.php' ); ?>" class="hide-if-no-js page-title-action"><?php echo esc_html_x( 'Add New', 'Add new theme' ); ?></a>
 	<?php endif; ?>
 
-	<form class="wp-filter-search-form"></form>
+	<form class="search-form"></form>
 
 	<hr class="wp-header-end">
 <?php