diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index f7685b0196..f97e70b974 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -474,19 +474,18 @@ endif;
 
 <?php screen_options('post', 1) ?>
 
-<?php if ( $notice ) : ?>
-<div id="notice" class="error"><p><?php echo $notice ?></p></div>
-<?php endif; ?>
-<?php if (isset($_GET['message'])) : ?>
-<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
-<?php endif; ?>
-
 <?php if ( (isset($mode) && 'bookmarklet' == $mode) || isset($_GET['popupurl']) ): ?>
 <input type="hidden" name="mode" value="bookmarklet" />
 <?php endif; ?>
 
 <div class="wrap">
 <h2><?php echo wp_specialchars( $title ); ?></h2>
+<?php if ( $notice ) : ?>
+<div id="notice" class="error"><p><?php echo $notice ?></p></div>
+<?php endif; ?>
+<?php if (isset($_GET['message'])) : ?>
+<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
+<?php endif; ?>
 <form name="post" action="post.php" method="post" id="post">
 <?php
 
diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php
index 60e42e0477..302bf8bcee 100644
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -102,6 +102,9 @@ require_once('admin-header.php'); ?>
 
 <?php screen_options('page') ?>
 
+<div class="wrap">
+<h2><?php echo wp_specialchars( $title ); ?></h2>
+
 <?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) ) { ?>
 <div id="message" class="updated fade"><p>
 <?php if ( (int) $_GET['updated'] ) {
@@ -126,9 +129,6 @@ if ( (int) $_GET['locked'] ) {
 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
 endif; ?>
 
-<div class="wrap">
-<h2><?php echo wp_specialchars( $title ); ?></h2>
-
 <form id="posts-filter" action="" method="get">
 <ul class="subsubsub">
 <?php