diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index ea7a80be5b..6f967f8d16 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -128,9 +128,9 @@ endif; ?>
 <form id="posts-filter" action="" method="get">
 	<h2><?php printf( current_user_can('manage_categories') ? __('Categories (<a href="%s">Add New</a>)') : __('Manage Tags'), '#addcat' ); ?></h2>
 
-<p id="post-search">
-	<label class="hidden" for="post-search-input"><?php _e('Search Categories'); ?>:</label>
-	<input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
+<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 echo attribute_escape(stripslashes($_GET['s'])); ?>" />
 	<input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
 </p>
 
diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css
index 7e3967e2f2..c9252683f1 100644
--- a/wp-admin/css/colors-classic.css
+++ b/wp-admin/css/colors-classic.css
@@ -73,8 +73,8 @@ strong .post-com-count span {
 }
 
 #post-body ul#category-tabs li.ui-tabs-selected, .button-secondary,
-#quicktags, #login form .submit input, #post-search .button,
-#post-search-prep .button, #ed_reply_toolbar {
+#quicktags, #login form .submit input, .search-box .button,
+#ed_reply_toolbar {
 	background-color: #8ebddc !important;
 }
 
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index ae13a8a962..b8abd148bb 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -73,8 +73,8 @@ strong .post-com-count span {
 }
 
 #post-body ul#category-tabs li.ui-tabs-selected, .button-secondary,
-#quicktags, #login form .submit input, #post-search .button,
-#post-search-prep .button, #ed_reply_toolbar {
+#quicktags, #login form .submit input, .search-box .button,
+#ed_reply_toolbar {
 	background-color: #cee1ef !important;
 }
 
@@ -139,7 +139,7 @@ ul#widget-list li.widget-list-item h4.widget-title {
 	border-color: #c00 !important;
 }
 
-.form-table input, .form-table textarea, #post-search-input {
+.form-table input, .form-table textarea, .search-input {
 	border-color: #c6d9e9;
 }
 
diff --git a/wp-admin/css/ie-rtl.css b/wp-admin/css/ie-rtl.css
index 1aa7cdb7db..9c9dc49c20 100644
--- a/wp-admin/css/ie-rtl.css
+++ b/wp-admin/css/ie-rtl.css
@@ -57,7 +57,7 @@ ul.view-switch li {
 form#posts-filter {
 	position:static;
 }
-#post-search {
+.search-box {
 	display:none;
 }
 #submenu {
diff --git a/wp-admin/css/ie.css b/wp-admin/css/ie.css
index e4d035548b..a2507d0ab5 100644
--- a/wp-admin/css/ie.css
+++ b/wp-admin/css/ie.css
@@ -117,7 +117,7 @@ table.ie-fixed {
 	table-layout: fixed;
 }
 
-#post-search .button, #widget-search .button {
+.search-box .button, #widget-search .button {
 	padding: 1px;
 }
 
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 98fe1298dd..302525d89e 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -121,9 +121,9 @@ unset($status_links);
 ?>
 </ul>
 
-<p id="post-search">
-	<label class="hidden" for="post-search-input"><?php _e( 'Search Comments' ); ?>:</label>
-	<input type="text" id="post-search-input" name="s" value="<?php echo $search; ?>" />
+<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>
 
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
index e639dd7c0c..c19a9cdb7a 100644
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -67,9 +67,9 @@ endif; ?>
 <form id="posts-filter" action="" method="get">
 	<h2><?php printf( current_user_can('manage_categories') ? __('Link Categories (<a href="%s">Add New</a>)') : __('Manage Tags'), '#addcat' ); ?></h2>
 
-<p id="post-search">
-	<label class="hidden" for="post-search-input"><?php _e( 'Search Categories' ); ?>:</label>
-	<input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
+<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>
 
diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php
index a328dcf134..465f38161c 100644
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -123,10 +123,9 @@ if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET
 endif;
 ?>
 
-<p id="post-search">
-	<label class="hidden" for="post-search-input"><?php _e( 'Search Pages' ); ?>:</label>
-	<input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
-	<input type="submit" value="<?php _e( 'Search Pages' ); ?>" class="button" />
+<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(); ?>" />
 </p>
 
 <div class="tablenav">
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 8743dd16e4..a83e204ded 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -135,9 +135,9 @@ endif; ?>
 <form id="posts-filter" action="" method="get">
 	<h2><?php printf( current_user_can('manage_categories') ? __('Tags (<a href="%s">Add New</a>)') : __('Manage Tags'), '#addtag' ); ?></h2>
 
-<p id="post-search">
-	<label class="hidden" for="post-search-input"><?php _e( 'Search Tags' ); ?>:</label>
-	<input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
+<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>
 
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 03a728d04c..ad48ebf3e0 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -138,9 +138,9 @@ if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET
 endif;
 ?>
 
-<p id="post-search">
+<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" name="s" value="<?php the_search_query(); ?>" />
+	<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>
 
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 0a0658113d..e839161a99 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -1210,11 +1210,11 @@ function media_upload_library_form($errors) {
 <input type="hidden" name="post_id" value="<?php echo (int) $post_id; ?>" />
 <input type="hidden" name="post_mime_type" value="<?php echo attribute_escape( $_GET['post_mime_type'] ); ?>" />
 
-<div id="search-filter">
-	<label class="hidden" for="post-search-input"><?php _e('Search Media');?>:</label>
-	<input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
+<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 echo attribute_escape( __( 'Search Media' ) ); ?>" class="button" />
-</div>
+</p>
 
 <ul class="subsubsub">
 <?php
diff --git a/wp-admin/js/common.js b/wp-admin/js/common.js
index a8fbbf5e18..f21c9149ae 100644
--- a/wp-admin/js/common.js
+++ b/wp-admin/js/common.js
@@ -61,11 +61,6 @@ jQuery( function($) {
 
 	jQuery('#dashmenu li.wp-has-submenu').bind( 'mouseenter mouseleave', function() { return menuToggle( jQuery(this).children('ul'), 'toggle' ); } );
 
-	// Temp
-	if ( !$('#post-search, #widget-search').size() ) {
-		$('#wphead').append( '<p id="post-search-prep"><input id="post-search-input" type="text" /><input class="button" type="button" value="Search" /></p>' );
-	}
-
 } );
 
 //jQuery(function(){jQuery('#media-buttons a').tTips();});
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index c0509a4315..2069502aa7 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -83,12 +83,12 @@ if ( isset($_GET['deleted']) ) {
 
 <div class="wrap">
 
-<form id="posts-filter" action="" method="get">
+<form id="links-filter" action="" method="get">
 <h2><?php printf( __('Links (<a href="%s">Add New</a>)' ), 'link-add.php' ); ?></h2>
 
-<p id="post-search">
-	<label class="hidden" for="post-search-input"><?php _e( 'Search Links' ); ?>:</label>
-	<input type="text" id="post-search-input" name="s" value="<?php echo ( isset( $_GET['s'] ) ? attribute_escape(stripslashes($_GET['s'])) : ''); ?>" />
+<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>
 
diff --git a/wp-admin/rtl.css b/wp-admin/rtl.css
index d5589cb74b..b2804985b6 100644
--- a/wp-admin/rtl.css
+++ b/wp-admin/rtl.css
@@ -306,7 +306,7 @@ div.ui-tabs-panel {
 	margin-left:0;
 	margin-right: 18px;
 }
-p#tag-search, p#post-search {
+p#tag-search, p.search-box {
 	right:auto;
 	left:0;
 }
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index ee95f6674e..0acdc3c725 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -138,9 +138,9 @@ if (isset($_GET['message'])) : ?>
 endif;
 ?>
 
-<p id="post-search">
-	<label class="hidden" for="post-search-input"><?php _e( 'Search Media' ); ?>:</label>
-	<input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
+<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>
 
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 17d4855b5c..da79555775 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -300,9 +300,9 @@ unset($role_links);
 ?>
 </ul>
 
-	<p id="post-search">
-	<label class="hidden" for="post-search-input"><?php _e( 'Search Users' ); ?>:</label>
-	<input type="text" id="post-search-input" name="usersearch" value="<?php echo attribute_escape($wp_user_search->search_term); ?>" />
+	<p id="user-search" class="search-box">
+	<label class="hidden" for="user-search-input"><?php _e( 'Search Users' ); ?>:</label>
+	<input type="text" id="user-search-input" class="search-input" name="usersearch" value="<?php echo attribute_escape($wp_user_search->search_term); ?>" />
 	<input type="submit" value="<?php _e( 'Search Users' ); ?>" class="button" />
 	</p>
 
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index a484963ea1..7f2a8f86a2 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -1545,19 +1545,19 @@ p#big-add-button .button {
 	padding: 3px 30px;
 }
 
-p#post-search {
+p.search-box {
 	position: absolute;
 	right: 0;
 	top: -64px;
 	margin: 0;
 }
 
-#post-search .button, #widget-search .button {
+p.search-box .button, #widget-search .button {
 	padding: 3px;
 	font-size: 13px;
 }
 
-#post-search-input {
+.search-input {
 	margin-right: 2px;
 	border-width: 1px;
 	border-style: solid;