diff --git a/wp-admin/comment.php b/wp-admin/comment.php
index c0c96ec3da..c9eea19116 100644
--- a/wp-admin/comment.php
+++ b/wp-admin/comment.php
@@ -184,9 +184,10 @@ case 'approvecomment':
 
 case 'editedcomment':
 
-	$comment_id = (int) $_POST['comment_ID'];
+	$comment_ID = (int) $_POST['comment_ID'];
+	$comment_post_ID = (int) $_POST['comment_post_id'];
 
-	check_admin_referer('update-comment_' . $comment_id);
+	check_admin_referer('update-comment_' . $comment_ID);
 
 	edit_comment();
 
@@ -194,7 +195,7 @@ case 'editedcomment':
 	if (!empty($referredby)) {
 		header('Location: ' . $referredby);
 	} else {
-		header ("Location: edit.php?p=$comment_id&c=1#comments");
+		header ("Location: edit.php?p=$comment_post_ID&c=1#comments");
 	}
 
 	break;