diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 0e0df245d..92da6a6a0 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -13,10 +13,16 @@ list($post_stati, $avail_post_stati) = wp_edit_posts_query();
 $wp_query->max_num_pages = ceil( $wp_query->found_posts / 15 ); // We grab 20 but only show 15 ( 5 more for ajax extra )
 ?>
 
+<?php
+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="post.php?action=edit&amp;post=<?php echo $_GET['posted']; ?>"><?php _e('Edit post'); ?></a></p></div>
+<?php
+endif;
+?>
+
 <div class="wrap">
 
 <?php
-
 $posts_columns = wp_manage_posts_columns();
 
 ?>
diff --git a/wp-admin/post-new.php b/wp-admin/post-new.php
index 1d8807a1f..dc65dbe29 100644
--- a/wp-admin/post-new.php
+++ b/wp-admin/post-new.php
@@ -22,7 +22,7 @@ When you&#8217;re promoted, just reload this page and you&#8217;ll be able to bl
 	exit();
 }
 
-if ( isset($_GET['posted']) && $_GET['posted'] ) : ?>
+if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
 <div id="message" class="updated fade"><p><strong><?php _e('Post saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View post &raquo;'); ?></a></p></div>
 <?php
 endif;
diff --git a/wp-admin/post.php b/wp-admin/post.php
index 6ff32cfee..233934e0f 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -12,14 +12,12 @@ if ( isset( $_POST['deletepost'] ) )
 switch($action) {
 case 'postajaxpost':
 case 'post':
-	$parent_file = 'post-new.php';
-	$submenu_file = 'post-new.php';
 	check_admin_referer('add-post');
 
 	$post_ID = 'post' == $action ? write_post() : edit_post();
 
 	// Redirect.
-	if (!empty($_POST['mode'])) {
+	if ( !empty( $_POST['mode'] ) ) {
 	switch($_POST['mode']) {
 		case 'bookmarklet':
 			$location = $_POST['referredby'];
@@ -35,13 +33,13 @@ case 'post':
 		$location = "post-new.php?posted=$post_ID";
 	}
 
-	if ( isset($_POST['save']) )
+	if ( isset( $_POST['save'] ) )
 		$location = "post.php?action=edit&post=$post_ID";
 
-	if ( empty($post_ID) )
+	if ( empty( $post_ID ) )
 		$location = 'post-new.php';
 
-	wp_redirect($location);
+	wp_redirect( $location );
 	exit();
 	break;
 
@@ -139,7 +137,7 @@ case 'editpost':
 		} elseif ($action == 'editattachment') {
 			$location = 'attachments.php';
 		} else {
-			$location = 'post-new.php';
+			$location = 'edit.php?posted=' . $post_ID;
 		}
 	}