diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index 091c580173..2d30360edf 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -117,17 +117,8 @@ $messages[2] = __('Category deleted.');
 $messages[3] = __('Category updated.');
 $messages[4] = __('Category not added.');
 $messages[5] = __('Category not updated.');
-?>
 
-<form class="search-form" action="" method="get">
-	<p id="category-search" class="search-box">
-		<label class="hidden" for="category-search-input"><?php _e('Search Categories'); ?></label>
-		<input type="text" id="category-search-input" class="search-input" name="s" value="<?php the_search_query(); ?>" />
-		<input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
-	</p>
-</form>
-
-<?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
+if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
 <div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
 endif; ?>
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index e582bd0127..cd368ea82c 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -67,17 +67,7 @@ $comment_status = isset($_GET['comment_status']) ? attribute_escape($_GET['comme
 
 $search_dirty = ( isset($_GET['s']) ) ? $_GET['s'] : '';
 $search = attribute_escape( $search_dirty );
-?>
 
-<form class="search-form" action="" method="get">
-	<p id="comment-search" class="search-box">
-		<label class="hidden" for="comment-search-input"><?php _e( 'Search Comments' ); ?></label>
-		<input type="text" id="comment-search-input" class="search-input" name="s" value="<?php the_search_query(); ?>" />
-		<input type="submit" value="<?php _e( 'Search Comments' ); ?>" class="button" />
-	</p>
-</form>
-
-<?php
 if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['spam'] ) ) {
 	$approved = isset( $_GET['approved'] ) ? (int) $_GET['approved'] : 0;
 	$deleted = isset( $_GET['deleted'] ) ? (int) $_GET['deleted'] : 0;
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
index d189e0dc10..e479b69014 100644
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -56,17 +56,7 @@ $messages[3] = __('Category updated.');
 $messages[4] = __('Category not added.');
 $messages[5] = __('Category not updated.');
 $messages[6] = __('Categories deleted.');
-?>
 
-<form class="search-form" action="" method="get">
-	<p id="link-category-search" class="search-box">
-		<label class="hidden" for="link-category-search-input"><?php _e( 'Search Categories' ); ?></label>
-		<input type="text" id="link-category-search-input" class="search-input" name="s" value="<?php the_search_query(); ?>" />
-		<input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
-	</p>
-</form>
-
-<?php
 if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
 <div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php
index bee05d91fc..175f1267e6 100644
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -94,17 +94,7 @@ if ( is_singular() ) {
 
 require_once('admin-header.php');
 
-?>
-
-<form class="search-form" action="" method="get">
-	<p id="page-search" class="search-box">
-		<label class="hidden" for="page-search-input"><?php _e( 'Search Pages' ); ?></label>
-		<input type="text" id="page-search-input" name="s" value="<?php the_search_query(); ?>" />
-		<input type="submit" value="<?php _e( 'Search Pages' ); ?>" class="button" />
-	</p>
-</form>
-
-<?php if ( isset($_GET['upd']) && (int) $_GET['upd'] ) { ?>
+if ( isset($_GET['upd']) && (int) $_GET['upd'] ) { ?>
 <div id="message" class="updated fade"><p>
 <?php printf( __ngettext( '%d page updated.', '%d pages updated.', $_GET['upd'] ), number_format_i18n( $_GET['upd'] ) );
 unset($_GET['upd']);
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index d7591bceff..d15f9c13f4 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -123,17 +123,8 @@ $messages[3] = __('Tag updated.');
 $messages[4] = __('Tag not added.');
 $messages[5] = __('Tag not updated.');
 $messages[6] = __('Tags deleted.');
-?>
 
-<form class="search-form" action="" method="get">
-	<p id="tag-search" class="search-box">
-		<label class="hidden" for="tag-search-input"><?php _e( 'Search Tags' ); ?></label>
-		<input type="text" id="tag-search-input" class="search-input" name="s" value="<?php the_search_query(); ?>" />
-		<input type="submit" value="<?php _e( 'Search Tags' ); ?>" class="button" />
-	</p>
-</form>
-
-<?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
+if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
 <div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
 endif; ?>
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 0583782847..e507392333 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -89,17 +89,8 @@ if ( empty($_GET['mode']) )
 	$mode = 'list';
 else
 	$mode = attribute_escape($_GET['mode']);
-?>
 
-<form class="search-form" action="" method="get">
-	<p id="post-search" class="search-box">
-		<label class="hidden" for="post-search-input"><?php _e( 'Search Posts' ); ?></label>
-		<input type="text" id="post-search-input" class="search-input" name="s" value="<?php the_search_query(); ?>" />
-		<input type="submit" value="<?php _e( 'Search Posts' ); ?>" class="button" />
-	</p>
-</form>
-
-<?php if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
+if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
 <div id="message" class="updated fade"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit post'); ?></a></p></div>
 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
 endif; ?>
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index 7c5fe9c80b..65a9f73ee9 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -72,17 +72,7 @@ switch ($order_by) {
 		$sqlorderby = 'name';
 		break;
 }
-?>
 
-<form class="search-form" action="" method="get">
-	<p id="link-search" class="search-box">
-		<label class="hidden" for="link-search-input"><?php _e( 'Search Links' ); ?></label>
-		<input type="text" id="link-search-input" name="s" value="<?php the_search_query(); ?>" />
-		<input type="submit" value="<?php _e( 'Search Links' ); ?>" class="button" />
-	</p>
-</form>
-
-<?php
 if ( isset($_GET['deleted']) ) {
 	echo '<div id="message" class="updated fade"><p>';
 	$deleted = (int) $_GET['deleted'];
diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index bb784eccf5..a5d7df3bcb 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -123,8 +123,8 @@ do_action( 'adminmenu' );
 <li>
 <form class="search-form" action="<?php echo $pagenow ?>" method="get">
 	<p id="search" class="the-search-box">
-		<label class="hidden" for="tag-search-input"><?php _e( 'Search' ); ?></label>
-		<input type="text" size="15" id="tag-search-input" class="search-input" name="s" value="<?php the_search_query(); ?>" />
+		<label class="hidden" for="search-input"><?php _e( 'Search' ); ?></label>
+		<input type="text" size="15" id="search-input" class="search-input" name="s" value="<?php the_search_query(); ?>" />
 		<input type="submit" value="<?php _e( 'Search' ); ?>" class="button" />
 	</p>
 </form>
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 6f10c6704a..f694ffa6d9 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -137,14 +137,6 @@ if ( is_singular() ) {
 
 require_once('admin-header.php'); ?>
 
-<form class="search-form" action="" method="get">
-	<p id="media-search" class="search-box" >
-		<label class="hidden" for="media-search-input"><?php _e( 'Search Media' ); ?></label>
-		<input type="text" id="media-search-input" class="search-input" name="s" value="<?php the_search_query(); ?>" />
-		<input type="submit" value="<?php _e( 'Search Media' ); ?>" class="button" />
-	</p>
-</form>
-
 <div class="wrap">
 
 <form id="adv-settings" action="" method="get">