diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 9efb8310e..454839b20 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -163,7 +163,7 @@ if ('publish' != $post_status || 0 == $post_ID) {
 <?php
 }
 ?>
-	<input name="referredby" type="hidden" id="referredby" value="<?php echo $_SERVER['HTTP_REFERER']; ?>" />
+	<input name="referredby" type="hidden" id="referredby" value="<?php echo htmlspecialchars($_SERVER['HTTP_REFERER']); ?>" />
 </p>
 <?php
 if ('' != $pinged) {
diff --git a/wp-admin/post.php b/wp-admin/post.php
index 6bfdf335d..0f8b5b4dd 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -334,6 +334,8 @@ case 'editpost':
 		$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';
 	}