Index: wp-admin/includes/class-wp-plugins-list-table.php
===================================================================
--- wp-admin/includes/class-wp-plugins-list-table.php	(revision 16392)
+++ wp-admin/includes/class-wp-plugins-list-table.php	(working copy)
@@ -15,9 +15,9 @@
 		if ( empty( $default_status ) )
 			$default_status = 'all';
 		$status = isset( $_REQUEST['plugin_status'] ) ? $_REQUEST['plugin_status'] : $default_status;
-		if ( !in_array( $status, array( 'all', 'active', 'inactive', 'recently_activated', 'upgrade', 'network', 'mustuse', 'dropins', 'search' ) ) )
+		if ( !in_array( $status, array( 'all', 'active', 'inactive', 'recently_activated', 'upgrade', 'network', 'mustuse', 'dropins' ) ) )
 			$status = 'all';
-		if ( $status != $default_status && 'search' != $status )
+		if ( $status != $default_status )
 			update_user_meta( get_current_user_id(), 'plugins_last_view', $status );
 
 		$page = $this->get_pagenum();
@@ -48,7 +48,6 @@
 
 		$plugins = array(
 			'all' => apply_filters( 'all_plugins', get_plugins() ),
-			'search' => array(),
 			'active' => array(),
 			'inactive' => array(),
 			'recently_activated' => array(),
@@ -103,17 +102,13 @@
 			$plugins['upgrade'] = array();
 
 		if ( $s ) {
-			$status = 'search';
-			$plugins['search'] = array_filter( $plugins['all'], array( &$this, '_search_callback' ) );
+			$plugins[$status] = array_filter( $plugins[$status], array( &$this, '_search_callback' ) );
 		}
 
 		$totals = array();
 		foreach ( $plugins as $type => $list )
 			$totals[ $type ] = count( $list );
 
-		if ( empty( $plugins[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) )
-			$status = 'all';
-
 		$this->items = array();
 		foreach ( $plugins[ $status ] as $plugin_file => $plugin_data ) {
 			// Translate, Apply Markup, Sanitize HTML
@@ -194,12 +189,7 @@
 		);
 	}
 
-	function display_tablenav( $which ) {
-		global $status;
 
-		if ( !in_array( $status, array( 'mustuse', 'dropins' ) ) )
-			parent::display_tablenav( $which );
-	}
 
 	function get_views() {
 		global $totals, $status;
@@ -234,9 +224,6 @@
 				case 'upgrade':
 					$text = _n( 'Upgrade Available <span class="count">(%s)</span>', 'Upgrade Available <span class="count">(%s)</span>', $count );
 					break;
-				case 'search':
-					$text = _n( 'Search Results <span class="count">(%s)</span>', 'Search Results <span class="count">(%s)</span>', $count );
-					break;
 			}
 
 			$status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
Index: wp-admin/plugins.php
===================================================================
--- wp-admin/plugins.php	(revision 16392)
+++ wp-admin/plugins.php	(working copy)
@@ -363,6 +363,7 @@
 <p class="search-box">
 	<label class="screen-reader-text" for="plugin-search-input"><?php _e( 'Search Plugins' ); ?>:</label>
 	<input type="text" id="plugin-search-input" name="s" value="<?php _admin_search_query(); ?>" />
+	<input type="hidden" name="plugin_status" value="<?php echo esc_attr($status) ?>" />
 	<?php submit_button( __( 'Search Installed Plugins' ), 'button', '', false ); ?>
 </p>
 </form>
@@ -377,9 +378,9 @@
 
 <?php
 if ( 'mustuse' == $status )
-	echo '<br class="clear"><p>' . __( 'Files in the <code>/wp-content/mu-plugins</code> directory are executed automatically.' ) . '</p>';
+	echo '<div class="alignleft clear"><p>' . __( 'Files in the <code>/wp-content/mu-plugins</code> directory are executed automatically.' ) . '</p></div>';
 elseif ( 'dropins' == $status )
-	echo '<br class="clear"><p>' . __( 'Drop-ins are advanced plugins in the <code>/wp-content</code> directory that replace WordPress functionality when present.' ) . '</p>';
+	echo '<<div class="alignleft clear"><p>' . __( 'Drop-ins are advanced plugins in the <code>/wp-content</code> directory that replace WordPress functionality when present.' ) . '</p></div>';
 ?>
 
 <?php $wp_list_table->display(); ?>