diff --git a/src/wp-admin/css/themes.css b/src/wp-admin/css/themes.css
index 86fc133d73..f12fea63ea 100644
--- a/src/wp-admin/css/themes.css
+++ b/src/wp-admin/css/themes.css
@@ -20,6 +20,10 @@
 }
 
 /* Search form */
+.themes-php .wp-filter-search-form {
+	display: inline;
+}
+
 .themes-php .wp-filter-search {
 	position: relative;
 	top: -2px;
diff --git a/src/wp-admin/js/theme.js b/src/wp-admin/js/theme.js
index 39ed26ad94..ea9ae00c27 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: $( '.search-form' ),
+	searchContainer: $( '.wp-filter-search-form' ),
 
 	// Search input and view
 	// for current theme collection
diff --git a/src/wp-admin/themes.php b/src/wp-admin/themes.php
index c02c17a38a..a7c6596171 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; ?>
 
-	<span class="search-form"></span>
+	<form class="wp-filter-search-form"></form>
 
 	<hr class="wp-header-end">
 <?php