diff --git a/wp-admin/edit-post-rows.php b/wp-admin/edit-post-rows.php
index 0507f725f0..2bf88416cd 100644
--- a/wp-admin/edit-post-rows.php
+++ b/wp-admin/edit-post-rows.php
@@ -10,7 +10,7 @@
 if ( !defined('ABSPATH') )
 	die('-1');
 ?>
-<table class="widefat <?php echo $post_type == 'page' ? 'page' : 'post'; ?> fixed" cellspacing="0">
+<table class="widefat <?php echo $post_type_object->hierarchical ? 'page' : 'post'; ?> fixed" cellspacing="0">
 	<thead>
 	<tr>
 <?php print_column_headers( $current_screen ); ?>
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 9c53608648..bb53a2a054 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -994,7 +994,7 @@ function inline_edit_row( $screen ) {
 		<label>
 			<span class="title"><?php _e( 'Parent' ); ?></span>
 <?php
-	$dropdown_args = array('selected' => $post->post_parent, 'name' => 'post_parent', 'show_option_none' => __('Main Page (no parent)'), 'option_none_value' => 0, 'sort_column'=> 'menu_order, post_title');
+	$dropdown_args = array('post_type' => $post_type_object->name, 'selected' => $post->post_parent, 'name' => 'post_parent', 'show_option_none' => __('Main Page (no parent)'), 'option_none_value' => 0, 'sort_column'=> 'menu_order, post_title');
 	if ( $bulk )
 		$dropdown_args['show_option_no_change'] =  __('&mdash; No Change &mdash;');
 	$dropdown_args = apply_filters('quick_edit_dropdown_pages_args', $dropdown_args);