diff --git a/wp-admin/css/wp-admin.dev.css b/wp-admin/css/wp-admin.dev.css
index 2a7cca0ef..b0828abf0 100644
--- a/wp-admin/css/wp-admin.dev.css
+++ b/wp-admin/css/wp-admin.dev.css
@@ -7575,6 +7575,10 @@ h3 span {
 	line-height: 180%;
 }
 
+#filter-box {
+	clear: both;
+}
+
 .feature-filter {
 	padding: 8px 12px 0;
 }
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index e97f98f1f..694ed0fca 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -171,12 +171,12 @@ if ( ! current_user_can( 'switch_themes' ) ) {
 }
 ?>
 
+<form class="search-form filter-form" action="" method="get">
+
 <h3 class="available-themes"><?php _e('Available Themes'); ?></h3>
 
 <?php if ( !empty( $_REQUEST['s'] ) || !empty( $_REQUEST['features'] ) || $wp_list_table->has_items() ) : ?>
 
-<form class="search-form filter-form" action="" method="get">
-
 <p class="search-box">
 	<label class="screen-reader-text" for="theme-search-input"><?php _e('Search Installed Themes'); ?>:</label>
 	<input type="search" id="theme-search-input" name="s" value="<?php _admin_search_query(); ?>" />
@@ -184,8 +184,6 @@ if ( ! current_user_can( 'switch_themes' ) ) {
 	<a id="filter-click" href="?filter=1"><?php _e( 'Feature Filter' ); ?></a>
 </p>
 
-<br class="clear"/>
-
 <div id="filter-box" style="<?php if ( empty($_REQUEST['filter']) ) echo 'display: none;'; ?>">
 <?php $feature_list = get_theme_feature_list(); ?>
 	<div class="feature-filter">
@@ -224,10 +222,10 @@ if ( ! current_user_can( 'switch_themes' ) ) {
 	<br class="clear"/>
 </div>
 
-<br class="clear" />
-
 <?php endif; ?>
 
+<br class="clear" />
+
 <?php $wp_list_table->display(); ?>
 
 </form>