diff --git a/src/wp-admin/includes/class-wp-posts-list-table.php b/src/wp-admin/includes/class-wp-posts-list-table.php
index f228805c78..ae0f2441fe 100644
--- a/src/wp-admin/includes/class-wp-posts-list-table.php
+++ b/src/wp-admin/includes/class-wp-posts-list-table.php
@@ -1555,7 +1555,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 				$default_title = apply_filters( 'default_page_template_title',  __( 'Default Template' ), 'quick-edit' );
                 ?>
 				<option value="default"><?php echo esc_html( $default_title ); ?></option>
-				<?php page_template_dropdown( $post->page_template, $screen->post_type ) ?>
+				<?php page_template_dropdown( '', $screen->post_type ) ?>
 			</select>
 		</label>
 	<?php endif; ?>
diff --git a/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php
index 27eadc6151..edf9a8641c 100644
--- a/src/wp-admin/includes/template.php
+++ b/src/wp-admin/includes/template.php
@@ -297,7 +297,7 @@ function get_inline_data($post) {
 		echo '<div class="post_parent">' . $post->post_parent . '</div>';
 	}
 
-	echo '<div class="page_template">' . esc_html( $post->page_template ) . '</div>';
+	echo '<div class="page_template">' . ( $post->page_template ? esc_html( $post->page_template ) : 'default' ) . '</div>';
 
 	if ( post_type_supports( $post->post_type, 'page-attributes' ) ) {
 		echo '<div class="menu_order">' . $post->menu_order . '</div>';
diff --git a/src/wp-admin/js/inline-edit-post.js b/src/wp-admin/js/inline-edit-post.js
index 9582707479..84ffd788a9 100644
--- a/src/wp-admin/js/inline-edit-post.js
+++ b/src/wp-admin/js/inline-edit-post.js
@@ -129,9 +129,9 @@ inlineEditPost = {
 			id = t.getId(id);
 		}
 
-		fields = ['post_title', 'post_name', 'post_author', '_status', 'jj', 'mm', 'aa', 'hh', 'mn', 'ss', 'post_password', 'post_format', 'menu_order'];
+		fields = ['post_title', 'post_name', 'post_author', '_status', 'jj', 'mm', 'aa', 'hh', 'mn', 'ss', 'post_password', 'post_format', 'menu_order', 'page_template'];
 		if ( t.type === 'page' ) {
-			fields.push('post_parent', 'page_template');
+			fields.push('post_parent');
 		}
 
 		// add the new edit row with an extra blank row underneath to maintain zebra striping.