diff --git a/wp-admin/edit-post-rows.php b/wp-admin/edit-post-rows.php
index 17ca71ea47..95ad1c6f7f 100644
--- a/wp-admin/edit-post-rows.php
+++ b/wp-admin/edit-post-rows.php
@@ -74,7 +74,7 @@ foreach($posts_columns as $column_name=>$column_display_name) {
 		if ( !empty( $categories ) ) {
 			$out = array();
 			foreach ( $categories as $c )
-				$out[] = "<a href='edit.php?category_name=$c->slug'> " . wp_specialchars( $c->name) . "</a>";
+				$out[] = "<a href='edit.php?category_name=$c->slug'> " . wp_specialchars(sanitize_term_field('name', $c->name, $c->term_id, 'category', 'display')) . "</a>";
 			echo join( ', ', $out );
 		} else {
 			_e('Uncategorized');
@@ -90,7 +90,7 @@ foreach($posts_columns as $column_name=>$column_display_name) {
 		if ( !empty( $tags ) ) {
 			$out = array();
 			foreach ( $tags as $c )
-				$out[] = "<a href='edit.php?tag=$c->slug'> " . wp_specialchars( $c->name) . "</a>";
+				$out[] = "<a href='edit.php?tag=$c->slug'> " . wp_specialchars(sanitize_term_field('name', $c->name, $c->term_id, 'post_tag', 'display')) . "</a>";
 			echo join( ', ', $out );
 		} else {
 			_e('No Tags');