diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index b2fa72214..dcd6119e2 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -9,6 +9,13 @@ if (0 == $post_ID) {
 	$form_action = 'editpost';
 	$form_extra = "<input type='hidden' name='post_ID' value='$post_ID' />";
 }
+
+$sendto = $_SERVER['HTTP_REFERER'];
+
+if ( $sendto == get_permalink($post) )
+	$sendto = 'redo';
+$sendto = wp_specialchars( $sendto );
+
 ?>
 
 <form name="post" action="post.php" method="post" id="post">
@@ -79,7 +86,7 @@ edCanvas = document.getElementById('content');
 
 <p class="submit">
   <input name="savepage" type="submit" id="savepage" tabindex="6" value="<?php $post_ID ? _e('Edit Page') :_e('Create New Page') ?> &raquo;" /> 
-  <input name="referredby" type="hidden" id="referredby" value="<?php if (isset($_SERVER['HTTP_REFERER'])) echo wp_specialchars($_SERVER['HTTP_REFERER']); ?>" />
+  <input name="referredby" type="hidden" id="referredby" value="<?php echo $sendto; ?>" />
 </p>
 
 <fieldset id="pageoptions">
diff --git a/wp-admin/post.php b/wp-admin/post.php
index 0f63d8750..568a4b22f 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -342,21 +342,8 @@ case 'editpost':
 		$datemodif_gmt = '';
 	}
 
-	if ($_POST['save']) {
-		$location = $_SERVER['HTTP_REFERER'];
-	} elseif ($_POST['updatemeta']) {
-		$location = $_SERVER['HTTP_REFERER'] . '&message=2#postcustom';
-	} elseif ($_POST['deletemeta']) {
-		$location = $_SERVER['HTTP_REFERER'] . '&message=3#postcustom';
-	} elseif (isset($_POST['referredby']) && $_POST['referredby'] != $_SERVER['HTTP_REFERER']) {
-		$location = $_POST['referredby'];
-	} else {
-		$location = 'post.php';
-	}
-	header ('Location: ' . $location); // Send user on their way while we keep working
-
-		$now = current_time('mysql');
-		$now_gmt = current_time('mysql', 1);
+	$now = current_time('mysql');
+	$now_gmt = current_time('mysql', 1);
 
 	$result = $wpdb->query("
 		UPDATE $wpdb->posts SET
@@ -378,6 +365,21 @@ case 'editpost':
 			post_parent = '$post_parent'
 		WHERE ID = $post_ID ");
 
+	if ($_POST['save']) {
+		$location = $_SERVER['HTTP_REFERER'];
+	} elseif ($_POST['updatemeta']) {
+		$location = $_SERVER['HTTP_REFERER'] . '&message=2#postcustom';
+	} elseif ($_POST['deletemeta']) {
+		$location = $_SERVER['HTTP_REFERER'] . '&message=3#postcustom';
+	} elseif (isset($_POST['referredby']) && $_POST['referredby'] != $_SERVER['HTTP_REFERER']) {
+		$location = $_POST['referredby'];
+		if ( $_POST['referredby'] == 'redo' )
+			$location = get_permalink( $post_ID );
+	} else {
+		$location = 'post.php';
+	}
+	header ('Location: ' . $location); // Send user on their way while we keep working
+
 	// Meta Stuff
 	if ($_POST['meta']) :
 		foreach ($_POST['meta'] as $key => $value) :