diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index bda2b260c..f821ed517 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -133,15 +133,15 @@ $messages[5] = __('Category not updated.');
 
 <?php screen_options('category') ?>
 
+<div class="wrap nosubsub">
+<h2><?php echo wp_specialchars( $title ); ?></h2> 
+
 <?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']);
 endif; ?>
 
-<div class="wrap nosubsub">
-<h2><?php echo wp_specialchars( $title ); ?></h2> 
-
 <form class="search-form topmargin" action="" method="get">
 <p class="search-box">
 	<label class="hidden" for="category-search-input"><?php _e('Search Categories'); ?>:</label>
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 49c519eb0..526b41b95 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -131,14 +131,14 @@ $messages[6] = __('Tags deleted.'); ?>
 
 <?php screen_options('tag') ?>
 
+<div class="wrap nosubsub">
+<h2><?php echo wp_specialchars( $title ); ?></h2> 
+
 <?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']);
 endif; ?>
 
-<div class="wrap nosubsub">
-<h2><?php echo wp_specialchars( $title ); ?></h2> 
-
 <form class="search-form" action="" method="get">
 <p class="search-box">
 	<label class="hidden" for="tag-search-input"><?php _e( 'Search Tags' ); ?>:</label>