diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 2154f98d8..6e0d1e3fa 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -220,11 +220,17 @@ if ( isset($_REQUEST['approved']) || isset($_REQUEST['deleted']) || isset($_REQU
 <?php $wp_list_table->views(); ?>
 
 <form id="comments-form" action="" method="post">
+
+<?php if ( $wp_list_table->has_items() ) : ?>
+
 <p class="search-box">
 	<label class="screen-reader-text" for="comment-search-input"><?php _e( 'Search Comments' ); ?>:</label>
 	<input type="text" id="comment-search-input" name="s" value="<?php _admin_search_query(); ?>" />
 	<?php submit_button( __( 'Search Comments' ), 'button', 'submit', false ); ?>
 </p>
+
+<?php endif; ?>
+
 <?php if ( $post_id ) : ?>
 <input type="hidden" name="p" value="<?php echo esc_attr( intval( $post_id ) ); ?>" />
 <?php endif; ?>
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index a5cb382dc..883cb5da8 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -227,12 +227,17 @@ $_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated'
 <?php $wp_list_table->views(); ?>
 
 <form id="posts-filter" action="" method="get">
+
+<?php if ( $wp_list_table->has_items() ) : ?>
+
 <p class="search-box">
 	<label class="screen-reader-text" for="post-search-input"><?php echo $post_type_object->labels->search_items; ?>:</label>
 	<input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
 	<?php submit_button( $post_type_object->labels->search_items, 'button', 'submit', false ); ?>
 </p>
 
+<?php endif; ?>
+
 <input type="hidden" name="post_status" class="post_status_page" value="<?php echo !empty($_REQUEST['post_status']) ? esc_attr($_REQUEST['post_status']) : 'all'; ?>" />
 <input type="hidden" name="post_type" class="post_type_page" value="<?php echo $post_type; ?>" />
 
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index 5f02cd1b5..9a8bab928 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -75,17 +75,20 @@ if ( isset($_REQUEST['deleted']) ) {
 }
 ?>
 
-<form class="search-form" action="" method="get">
+<form id="posts-filter" action="" method="post">
+
+<?php if ( $wp_list_table->has_items() ) : ?>
+
 <p class="search-box">
 	<label class="screen-reader-text" for="link-search-input"><?php _e( 'Search Links' ); ?>:</label>
 	<input type="text" id="link-search-input" name="s" value="<?php _admin_search_query(); ?>" />
 	<?php submit_button( __( 'Search Links' ), 'button', '', false ); ?>
 </p>
-</form>
-<br class="clear" />
 
-<form id="posts-filter" action="" method="post">
+<?php endif; ?>
+
 <?php $wp_list_table->display(); ?>
+
 <div id="ajax-response"></div>
 </form>
 
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 5f790e370..3d97fe78a 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -362,19 +362,22 @@ if ( !empty($invalid) )
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); if ( current_user_can('install_plugins') ) { ?> <a href="plugin-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a><?php } ?></h2>
 
-<form method="get" action="">
-<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(); ?>" />
-	<?php submit_button( __( 'Search Installed Plugins' ), 'button', '', false ); ?>
-</p>
-</form>
-
 <?php do_action( 'pre_current_active_plugins', $plugins['all'] ) ?>
 
 <?php $wp_list_table->views(); ?>
 
 <form method="post" action="">
+
+<?php if ( $wp_list_table->has_items() ) : ?>
+
+<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(); ?>" />
+	<?php submit_button( __( 'Search Installed Plugins' ), 'button', '', false ); ?>
+</p>
+
+<?php endif; ?>
+
 <input type="hidden" name="plugin_status" value="<?php echo esc_attr($status) ?>" />
 <input type="hidden" name="paged" value="<?php echo esc_attr($page) ?>" />
 
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 7055ab535..216c11b13 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -202,16 +202,20 @@ if ( !empty($message) ) { ?>
 
 <?php $wp_list_table->views(); ?>
 
-<form class="search-form" action="" method="get">
+<form id="posts-filter" action="" method="post">
+
+<?php if ( $wp_list_table->has_items() ) : ?>
+
 <p class="search-box">
 	<label class="screen-reader-text" for="media-search-input"><?php _e( 'Search Media' ); ?>:</label>
 	<input type="text" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />
 	<?php submit_button( __( 'Search Media' ), 'button', 'submit', false ); ?>
 </p>
-</form>
 
-<form id="posts-filter" action="" method="post">
+<?php endif; ?>
+
 <?php $wp_list_table->display(); ?>
+
 <div id="ajax-response"></div>
 <?php find_posts_div(); ?>
 <br class="clear" />
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 3246877b5..d368a189c 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -353,15 +353,18 @@ if ( $usersearch )
 
 <?php $wp_list_table->views(); ?>
 
-<form class="search-form" action="" method="get">
+<form action="" method="post">
+
+<?php if ( $wp_list_table->has_items() ) : ?>
+
 <p class="search-box">
 	<label class="screen-reader-text" for="user-search-input"><?php _e( 'Search Users' ); ?>:</label>
 	<input type="text" id="user-search-input" name="s" value="<?php echo esc_attr($usersearch); ?>" />
 	<?php submit_button( __( 'Search Users' ), 'button', 'submit', false ); ?>
 </p>
-</form>
 
-<form id="posts-filter" action="" method="post">
+<?php endif; ?>
+
 <?php $wp_list_table->display(); ?>
 </form>