diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 9d3919c3bd..1a7d9df02b 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -457,7 +457,7 @@ if ( isset($_GET['s']) ) {
 }
 
 $plugin_array_name = "${status}_plugins";
-if ( empty($$plugin_array_name) && $status != 'all' ) {
+if ( empty($$plugin_array_name) && !in_array($status, array('all', 'search')) ) {
 	$status = 'all';
 	$plugin_array_name = "${status}_plugins";
 }