diff --git a/src/wp-admin/css/theme.css b/src/wp-admin/css/theme.css
index b95543225b..9b70079f0a 100644
--- a/src/wp-admin/css/theme.css
+++ b/src/wp-admin/css/theme.css
@@ -340,11 +340,10 @@
 /*
  * The search form
  */
-.theme-browser .theme-search {
-	float: left;
+.themes-php .theme-search {
 	position: relative;
-		top: 7px;
-		left: 10px;
+		top: -2px;
+		left: 20px;
 	font-size: 16px;
 	font-weight: 300;
 	line-height: 1.5;
diff --git a/src/wp-admin/js/theme.js b/src/wp-admin/js/theme.js
index 36853a56a5..040015c5a1 100644
--- a/src/wp-admin/js/theme.js
+++ b/src/wp-admin/js/theme.js
@@ -73,7 +73,7 @@ themes.view.Appearance = wp.Backbone.View.extend({
 
 		// Render and append after screen title
 		view.render();
-		self.$el.append( view.el );
+		$('#wpbody h2:first').append( view.el );
 	},
 
 	// Checks when the user gets close to the bottom
diff --git a/src/wp-admin/themes.php b/src/wp-admin/themes.php
index 33fdeccb97..17a2d4521a 100644
--- a/src/wp-admin/themes.php
+++ b/src/wp-admin/themes.php
@@ -119,9 +119,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 		<a href="<?php echo admin_url( 'theme-install.php' ); ?>" class="add-new-h2"><?php echo esc_html( _x( 'Add New', 'Add new theme' ) ); ?></a>
 	<?php endif; ?>
 	</h2>
-
-	<div class="theme-browser"></div>
-
 <?php
 if ( ! validate_current_theme() || isset( $_GET['broken'] ) ) : ?>
 <div id="message1" class="updated"><p><?php _e('The active theme is broken. Reverting to the default theme.'); ?></p></div>
@@ -180,6 +177,8 @@ if ( ! $ct->errors() || ( 1 == count( $ct->errors()->get_error_codes() )
 */
 ?>
 
+<div class="theme-browser"></div>
+
 <?php
 // List broken themes, if any.
 if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_get_themes( array( 'errors' => true ) ) ) {