diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index a6b4335170..3da61e6483 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -82,7 +82,7 @@ function _cat_row( $category, $level, $name_override = false ) {
 	$name = ( $name_override ? $name_override : $pad . ' ' . $category->name );
 	$edit_link = "categories.php?action=edit&cat_ID=$category->term_id";
 	if ( current_user_can( 'manage_categories' ) ) {
-		$edit = "<a class='row-title' href='$edit_link' title='" . attribute_escape(sprintf(__('Edit "%s"'), $category->name)) . "'>$name</a><br />";
+		$edit = "<a class='row-title' href='$edit_link' title='" . attribute_escape(sprintf(__('Edit "%s"'), $category->name)) . "'>" . attribute_escape( $name ) . '</a><br />';
 		$actions = array();
 		$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
 		if ( $default_cat_id != $category->term_id )
@@ -131,6 +131,9 @@ function _cat_row( $category, $level, $name_override = false ) {
 			case 'description':
 				$output .= "<td $attributes>$category->description</td>";
 				break;
+			case 'slug':
+				$output .= "<td $attributes>$category->slug</td>";
+				break;
 			case 'posts':
 				$attributes = 'class="posts column-posts num"' . $style;
 				$output .= "<td $attributes>$posts_count</td>\n";
@@ -401,6 +404,9 @@ function _tag_row( $tag, $class = '' ) {
 					}
 					$out .= '</td>';
 					break;
+				case 'slug':
+					$out .= "<td $attributes>$tag->slug</td>";
+					break;
 				case 'posts':
 					$attributes = 'class="posts column-posts num"' . $style;
 					$out .= "<td $attributes>$count</td>";
@@ -544,6 +550,7 @@ function get_column_headers($page) {
 				'cb' => '<input type="checkbox" />',
 				'name' => __('Name'),
 				'description' => __('Description'),
+				'slug' => __('Slug'),
 				'posts' => __('Posts')
 			);
 
@@ -561,6 +568,7 @@ function get_column_headers($page) {
 			$columns = array(
 				'cb' => '<input type="checkbox" />',
 				'name' => __('Name'),
+				'slug' => __('Slug'),
 				'posts' => __('Posts')
 			);