Index: wp-admin/includes/plugin-install.php
===================================================================
--- wp-admin/includes/plugin-install.php	(revision 18731)
+++ wp-admin/includes/plugin-install.php	(working copy)
@@ -119,18 +119,17 @@
 function install_search_form(){
 	$type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : '';
 	$term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : '';
-
-	?><form id="search-plugins" method="get" action="">
-		<input type="hidden" name="tab" value="search" />
-		<select name="type" id="typeselector">
-			<option value="term"<?php selected('term', $type) ?>><?php _e('Term'); ?></option>
-			<option value="author"<?php selected('author', $type) ?>><?php _e('Author'); ?></option>
-			<option value="tag"<?php selected('tag', $type) ?>><?php _ex('Tag', 'Plugin Installer'); ?></option>
-		</select>
-		<input type="text" name="s" value="<?php echo esc_attr($term) ?>" />
-		<label class="screen-reader-text" for="plugin-search-input"><?php _e('Search Plugins'); ?></label>
-		<?php submit_button( __( 'Search Plugins' ), 'button', 'plugin-search-input', false ); ?>
-	</form><?php
+	?>
+	<input type="hidden" name="tab" value="search" />
+	<select name="type" id="typeselector">
+		<option value="term"<?php selected('term', $type) ?>><?php _e('Term'); ?></option>
+		<option value="author"<?php selected('author', $type) ?>><?php _e('Author'); ?></option>
+		<option value="tag"<?php selected('tag', $type) ?>><?php _ex('Tag', 'Plugin Installer'); ?></option>
+	</select>
+	<input type="text" name="s" value="<?php echo esc_attr($term) ?>" />
+	<label class="screen-reader-text" for="plugin-search-input"><?php _e('Search Plugins'); ?></label>
+	<?php
+	submit_button( __( 'Search Plugins' ), 'button', 'plugin-search-input', false );
 }
 
 /**
Index: wp-admin/includes/class-wp-plugin-install-list-table.php
===================================================================
--- wp-admin/includes/class-wp-plugin-install-list-table.php	(revision 18731)
+++ wp-admin/includes/class-wp-plugin-install-list-table.php	(working copy)
@@ -112,14 +112,16 @@
 
 	function display_tablenav( $which ) {
 		if ( 'top' ==  $which ) { ?>
-			<div class="tablenav top">
-				<div class="alignleft actions">
-					<?php do_action( 'install_plugins_table_header' ); ?>
+			<form id="search-plugins" method="get" action="">
+				<div class="tablenav top">
+					<div class="alignleft actions">
+						<?php do_action( 'install_plugins_table_header' ); ?>
+					</div>
+					<?php $this->pagination( $which ); ?>
+					<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
+					<br class="clear" />
 				</div>
-				<?php $this->pagination( $which ); ?>
-				<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
-				<br class="clear" />
-			</div>
+			</form>
 		<?php } else { ?>
 			<div class="tablenav bottom">
 				<?php $this->pagination( $which ); ?>
Index: wp-admin/includes/class-wp-theme-install-list-table.php
===================================================================
--- wp-admin/includes/class-wp-theme-install-list-table.php	(revision 18731)
+++ wp-admin/includes/class-wp-theme-install-list-table.php	(working copy)
@@ -130,14 +130,18 @@
 
 		// wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
 ?>
-		<div class="tablenav top themes">
-			<div class="alignleft actions">
-				<?php do_action( 'install_themes_table_header' ); ?>
+		<form id="search-themes" method="get" action="">
+			<div class="tablenav top themes">
+				<div class="alignleft actions">
+					<?php do_action( 'install_themes_table_header' ); ?>
+				</div>
+	
+				<?php $this->pagination( 'top' ); ?>
+	
+				<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
+				<br class="clear" />
 			</div>
-			<?php $this->pagination( 'top' ); ?>
-			<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
-			<br class="clear" />
-		</div>
+		</form>
 
 		<div id="availablethemes">
 			<?php $this->display_rows_or_placeholder(); ?>
@@ -148,6 +152,7 @@
 			<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
 			<br class="clear" />
 		</div>
+
 <?php
 	}
 
Index: wp-admin/includes/theme-install.php
===================================================================
--- wp-admin/includes/theme-install.php	(revision 18731)
+++ wp-admin/includes/theme-install.php	(working copy)
@@ -55,17 +55,15 @@
 	?>
 <p class="install-help"><?php _e('Search for themes by keyword, author, or tag.') ?></p>
 
-<form id="search-themes" method="get" action="">
-	<input type="hidden" name="tab" value="search" />
-	<select	name="type" id="typeselector">
-	<option value="term" <?php selected('term', $type) ?>><?php _e('Term'); ?></option>
-	<option value="author" <?php selected('author', $type) ?>><?php _e('Author'); ?></option>
-	<option value="tag" <?php selected('tag', $type) ?>><?php _ex('Tag', 'Theme Installer'); ?></option>
-	</select>
-	<input type="text" name="s" size="30" value="<?php echo esc_attr($term) ?>" />
-	<?php submit_button( __( 'Search' ), 'button', 'search', false ); ?>
-</form>
-<?php
+<input type="hidden" name="tab" value="search" />
+<select	name="type" id="typeselector">
+<option value="term" <?php selected('term', $type) ?>><?php _e('Term'); ?></option>
+<option value="author" <?php selected('author', $type) ?>><?php _e('Author'); ?></option>
+<option value="tag" <?php selected('tag', $type) ?>><?php _ex('Tag', 'Theme Installer'); ?></option>
+</select>
+<input type="text" name="s" size="30" value="<?php echo esc_attr($term) ?>" />
+	<?php
+	submit_button( __( 'Search' ), 'button', 'search', false );
 }
 
 /**