diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index b3bdb9d52d..cc2233885b 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -257,7 +257,7 @@ function get_inline_data($post) {
 	if ( $post->post_type == 'page' )
 		echo '<div class="page_template">' . esc_html( get_post_meta( $post->ID, '_wp_page_template', true ) ) . '</div>';
 
-	if ( $post_type_object->hierarchical )
+	if ( post_type_supports( $post->post_type, 'page-attributes' ) )
 		echo '<div class="menu_order">' . $post->menu_order . '</div>';
 
 	$taxonomy_names = get_object_taxonomies( $post->post_type );
diff --git a/wp-admin/js/inline-edit-post.dev.js b/wp-admin/js/inline-edit-post.dev.js
index adebb4f5ab..13a5bce3c4 100644
--- a/wp-admin/js/inline-edit-post.dev.js
+++ b/wp-admin/js/inline-edit-post.dev.js
@@ -129,9 +129,9 @@ inlineEditPost = {
 		if ( typeof(id) == 'object' )
 			id = t.getId(id);
 
-		fields = ['post_title', 'post_name', 'post_author', '_status', 'jj', 'mm', 'aa', 'hh', 'mn', 'ss', 'post_password', 'post_format'];
+		fields = ['post_title', 'post_name', 'post_author', '_status', 'jj', 'mm', 'aa', 'hh', 'mn', 'ss', 'post_password', 'post_format', 'menu_order'];
 		if ( t.type == 'page' )
-			fields.push('post_parent', 'menu_order', 'page_template');
+			fields.push('post_parent', 'page_template');
 
 		// add the new blank row
 		editRow = $('#inline-edit').clone(true);