diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index bb5bef8ac..cc9c1b437 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -142,7 +142,7 @@ endif; ?>
 <div class="wrap">
 
 <ul class="subsubsub"><li class="current"><a class="current"><br /></a></li></ul>
-<form class="search-form" action="<?php echo $pagenow ?>" method="get">
+<form class="search-form" action="" method="get">
 <p class="search-box">
 	<label class="hidden" for="post-search-input"><?php _e('Search Categories'); ?>:</label>
 	<input type="text" class="search-input" id="post-search-input" name="s" value="<?php _admin_search_query(); ?>" />
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 664dfa1d6..126e25948 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -173,7 +173,7 @@ unset($status_links);
 </form>
 </div>
 
-<form class="search-form" action="<?php echo $pagenow ?>" method="get">
+<form class="search-form" action="" method="get">
 <p class="search-box">
 	<label class="hidden" for="post-search-input"><?php _e( 'Search Comments' ); ?>:</label>
 	<input type="text" class="search-input" id="post-search-input" name="s" value="<?php _admin_search_query(); ?>" />
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
index 88292e2cc..5d443922a 100644
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -78,7 +78,7 @@ endif; ?>
 <div class="wrap">
 
 <ul class="subsubsub"><li><a class="current"><br /></a></li></ul>
-<form class="search-form" action="<?php echo $pagenow ?>" method="get">
+<form class="search-form" action="" method="get">
 <p class="search-box">
 	<label class="hidden" for="post-search-input"><?php _e( 'Search Categories' ); ?>:</label>
 	<input type="text" class="search-input" id="post-search-input" name="s" value="<?php _admin_search_query(); ?>" />
diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php
index 3cd056f38..2d2927ee5 100644
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -162,7 +162,7 @@ endif;
 ?>
 </ul>
 
-<form class="search-form" action="<?php echo $pagenow ?>" method="get">
+<form class="search-form" action="" method="get">
 <p class="search-box">
 	<label class="hidden" for="post-search-input"><?php _e( 'Search Pages' ); ?>:</label>
 	<input type="text" class="search-input" id="post-search-input" name="s" value="<?php _admin_search_query(); ?>" />
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 4fa886e7e..fdb1bc37d 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -145,7 +145,7 @@ endif; ?>
 <div class="wrap">
 
 <ul class="subsubsub"><li class="current"><a class="current"><br /></a></li></ul>
-<form class="search-form" action="<?php echo $pagenow ?>" method="get">
+<form class="search-form" action="" method="get">
 <p class="search-box">
 	<label class="hidden" for="post-search-input"><?php _e( 'Search Tags' ); ?>:</label>
 	<input type="text" class="search-input" id="post-search-input" name="s" value="<?php _admin_search_query(); ?>" />
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 167f19039..2162e2f08 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -197,7 +197,7 @@ do_action('restrict_manage_posts');
 </form>
 </div>
 
-<form class="search-form" action="<?php echo $pagenow ?>" method="get">
+<form class="search-form" action="" method="get">
 <p class="search-box">
 	<label class="hidden" for="post-search-input"><?php _e( 'Search Posts' ); ?>:</label>
 	<input type="text" class="search-input" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index b62093664..51f523de7 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -121,7 +121,7 @@ echo $select_order;
 </form></div>
 
 <ul class="subsubsub"><li><a class="current"><br /></a></li></ul>
-<form class="search-form" action="<?php echo $pagenow ?>" method="get">
+<form class="search-form" action="" method="get">
 <p class="search-box">
 	<label class="hidden" for="post-search-input"><?php _e( 'Search Links' ); ?>:</label>
 	<input type="text" class="search-input" id="post-search-input" name="s" value="<?php _admin_search_query(); ?>" />
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 6b8d4acbb..2ffc8239b 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -252,7 +252,7 @@ foreach ($arc_result as $arc_row) {
 <?php } // ! is_singular ?>
 </form></div>
 
-<form class="search-form" action="<?php echo $pagenow ?>" method="get">
+<form class="search-form" action="" method="get">
 <p class="search-box">
 	<label class="hidden" for="post-search-input"><?php _e( 'Search Media' ); ?>:</label>
 	<input type="text" class="search-input" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />