diff --git a/wp-admin/comment.php b/wp-admin/comment.php
index 3ed3b8287..72d014703 100644
--- a/wp-admin/comment.php
+++ b/wp-admin/comment.php
@@ -141,8 +141,10 @@ case 'deletecomment' :
 	else
 		wp_delete_comment( $comment->comment_ID );
 
-	if ( '' != wp_get_referer() && false == $noredir )
+	if ( '' != wp_get_referer() && false == $noredir && false === strpos(wp_get_referer(), 'comment.php' ) )
 		wp_redirect( wp_get_referer() );
+	else if ( '' != wp_get_original_referer() && false == $noredir )
+		wp_redirect( wp_get_original_referer() );
 	else
 		wp_redirect( get_option('siteurl') . '/wp-admin/edit-comments.php' );
 
diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index f0baaee49..dfef0a78e 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -46,7 +46,7 @@ $time = mysql2date(get_option('time_format'), $comment->comment_date);
 <p class="submit">
 <input type="submit" name="save" value="<?php _e('Save'); ?>" tabindex="4" class="button button-highlighted" />
 <?php
-echo "<a class='submitdelete' href='" . wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment->comment_ID", 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n  'Cancel' to stop, 'OK' to delete.")) . "') ) { return true;}return false;\">" . __('Delete comment') . "</a>";
+echo "<a class='submitdelete' href='" . wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . wp_get_referer(), 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n  'Cancel' to stop, 'OK' to delete.")) . "') ) { return true;}return false;\">" . __('Delete comment') . "</a>";
 ?>
 </p>
 
@@ -95,6 +95,7 @@ echo "<a class='submitdelete' href='" . wp_nonce_url("comment.php?action=deletec
 <input type="hidden" name="c" value="<?php echo $comment->comment_ID ?>" />
 <input type="hidden" name="p" value="<?php echo $comment->comment_post_ID ?>" />
 <input name="referredby" type="hidden" id="referredby" value="<?php echo wp_get_referer(); ?>" />
+<?php wp_original_referer_field(true, 'previous'); ?>
 <input type="hidden" name="noredir" value="1" />
 </div>
 </div>