diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php
index 0c0231bc86..542e533abb 100644
--- a/wp-admin/includes/class-wp-posts-list-table.php
+++ b/wp-admin/includes/class-wp-posts-list-table.php
@@ -259,6 +259,9 @@ class WP_Posts_List_Table extends WP_List_Table {
 		if ( post_type_supports( $post_type, 'author' ) )
 			$posts_columns['author'] = __( 'Author' );
 
+		if ( post_type_supports( $post_type, 'post-formats' ) )
+			$posts_columns['format'] = _x( 'Format', 'post format' );
+
 		$taxonomies = array();
 
 		$taxonomies = get_object_taxonomies( $post_type, 'objects' );
@@ -646,6 +649,17 @@ class WP_Posts_List_Table extends WP_List_Table {
 			<?php
 			break;
 
+			case 'format':
+			?>
+			<td <?php echo $attributes ?>><?php
+				if ( get_post_format( $post->ID ) )
+					echo get_post_format_string( get_post_format( $post->ID ) );
+				else
+					echo get_post_format_string( 'standard' );
+			?></td>
+			<?php
+			break;
+
 			default:
 				if ( 'categories' == $column_name )
 					$taxonomy = 'category';
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index b8e45c61a6..6fb144bac5 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -1449,8 +1449,6 @@ function _post_states($post) {
 		}
 	}
 
-	if ( get_post_format( $post->ID ) )
-		echo ' - <span class="post-state-format">' . get_post_format_string( get_post_format( $post->ID ) ) . '</span>';
 }
 
 function _media_states( $post ) {