diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 912432fbaa..295b96a8f3 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -45,6 +45,11 @@ $post_ID = isset($post_ID) ? (int) $post_ID : 0;
 $user_ID = isset($user_ID) ? (int) $user_ID : 0;
 $action = isset($action) ? $action : '';
 
+if ( $post_ID == get_option( 'page_for_posts' ) && empty( $post->post_content ) ) {
+	add_action( 'edit_form_after_title', '_wp_posts_page_notice' );
+	remove_post_type_support( $post_type, 'editor' );
+}
+
 $thumbnail_support = current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports( $post_type, 'thumbnail' );
 if ( ! $thumbnail_support && 'attachment' === $post_type && $post->post_mime_type ) {
 	if ( 0 === strpos( $post->post_mime_type, 'audio/' ) ) {
diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php
index b99f30cc8f..acd84c30c1 100644
--- a/wp-admin/includes/meta-boxes.php
+++ b/wp-admin/includes/meta-boxes.php
@@ -739,7 +739,7 @@ function page_attributes_meta_box($post) {
 <?php
 		} // end empty pages check
 	} // end hierarchical check.
-	if ( 'page' == $post->post_type && 0 != count( get_page_templates( $post ) ) ) {
+	if ( 'page' == $post->post_type && 0 != count( get_page_templates( $post ) ) && get_option( 'page_for_posts' ) != $post->ID ) {
 		$template = !empty($post->page_template) ? $post->page_template : false;
 		?>
 <p><strong><?php _e('Template') ?></strong></p>
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index c1e362b5a3..8975e03110 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -2169,3 +2169,12 @@ function wp_star_rating( $args = array() ) {
 	echo str_repeat( '<div class="star star-empty"></div>', $empty_stars);
 	echo '</div>';
 }
+
+/**
+ * Output a notice when editing the page for posts.
+ *
+ * @since 4.2.0
+ */
+function _wp_posts_page_notice() {
+	echo '<div class="notice notice-warning inline"><p>' . __( 'You are currently editing the page that shows your latest posts.' ) . '</p></div>';
+}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index de2962d3f2..26b121153f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31549';
+$wp_version = '4.2-alpha-31550';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.