diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index 65833d7e5d..9b471c4152 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -1076,7 +1076,8 @@ function map_meta_cap( $cap, $user_id ) {
 			break;
 		}
 
-		if ( 'private' != $post->post_status ) {
+		$status_obj = get_post_status_object( $post->post_status );
+		if ( $status_obj->public ) {
 			$caps[] = $post_type->cap->read;
 			break;
 		}
@@ -1090,8 +1091,10 @@ function map_meta_cap( $cap, $user_id ) {
 
 		if ( is_object( $post_author_data ) && $user_id == $post_author_data->ID )
 			$caps[] = $post_type->cap->read;
-		else
+		elseif ( $status_obj->private )
 			$caps[] = $post_type->cap->read_private_posts;
+		else
+			$caps[] = map_meta_cap( 'edit_post', $user_id, $post->ID );
 		break;
 	case 'edit_post_meta':
 	case 'delete_post_meta':