diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 7bd73c9769..241482d03f 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -157,11 +157,10 @@ unset($status_links);
 <select name="comment_type">
 	<option value="all"><?php _e('Show all comment types'); ?></option>
 <?php
-	$comment_types = array(
+	$comment_types = apply_filters( 'admin_comment_types_dropdown', array(
 		'comment' => __('Comments'),
-		'pingback' => __('Pingbacks'),
-		'trackback' => __('Trackbacks'),
-	);
+		'pings' => __('Pings'),
+	) );
 
 	foreach ( $comment_types as $type => $label ) {
 		echo "	<option value='$type'";
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index ba99ee92d6..b03560da90 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -1785,6 +1785,8 @@ function _wp_get_comment_list( $status = '', $s = false, $start, $num, $post = 0
 		$typesql = "AND comment_type = 'pingback'";
 	elseif ( 'trackback' == $type )
 		$typesql = "AND comment_type = 'trackback'";
+	elseif ( 'pings' == $type )
+		$typesql = "AND ( comment_type = 'pingback' OR comment_type = 'trackback' )";
 	else
 		$typesql = '';
 
@@ -1943,7 +1945,9 @@ function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true
 			case 'response':
 				echo "<td $attributes>\n";
 				echo "&quot;$post_link&quot; ";
-				echo '<a href="edit-comments.php?p=' . $post->ID . '">' . sprintf ( __ngettext('(%s comment)', '(%s comments)', $post->comment_count), $post->comment_count ) . '</a><br />';
+				echo '<a href="edit-comments.php?p=' . $post->ID;
+				if ( !empty($_GET['comment_type']) ) echo '&amp;comment_type=' . htmlspecialchars( $_GET['comment_type'] );
+				echo '">' . sprintf ( __ngettext('(%s comment)', '(%s comments)', $post->comment_count), $post->comment_count ) . '</a><br />';
 				echo get_the_time(__('Y/m/d \a\t g:ia'));
 				echo '</td>';
 		}