diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
index c3457ba823..a01d0fb42d 100644
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -399,7 +399,13 @@ function set_screen_options() {
 
 		$option = str_replace('-', '_', $option);
 
-		switch ( $option ) {
+		$map_option = $option;
+		$type = str_replace('edit_', '', $map_option);
+		$type = str_replace('_per_page', '', $type);
+		if ( in_array($type, get_post_types()) )
+			$map_option = 'edit_per_page';
+
+		switch ( $map_option ) {
 			case 'edit_per_page':
 			case 'edit_pages_per_page':
 			case 'edit_comments_per_page':
diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index d6c6819ce4..8848c51525 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -851,6 +851,10 @@ function wp_edit_posts_query( $q = false ) {
 		$orderby = 'date';
 	}
 
+	if ( 'post' != $post_type )
+		$per_page = 'edit_' . $post_type . '_per_page';
+	else
+		$per_page = 'edit_per_page';
 	$posts_per_page = (int) get_user_option( 'edit_per_page' );
 	if ( empty( $posts_per_page ) || $posts_per_page < 1 )
 		$posts_per_page = 15;