diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index 2d27efca49..142f9c57f5 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -2258,7 +2258,7 @@ function the_block_editor_meta_boxes() {
 	<form class="metabox-base-form">
 	<?php the_block_editor_meta_box_post_form_hidden_fields( $post ); ?>
 	</form>
-	<form id="toggle-custom-fields-form" method="post" action="<?php echo esc_attr( admin_url( 'post.php' ) ); ?>">
+	<form id="toggle-custom-fields-form" method="post" action="<?php echo esc_url( admin_url( 'post.php' ) ); ?>">
 		<?php wp_nonce_field( 'toggle-custom-fields', 'toggle-custom-fields-nonce' ); ?>
 		<input type="hidden" name="action" value="toggle-custom-fields" />
 	</form>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9ad37bba9a..2c29aa679e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.8-alpha-50808';
+$wp_version = '5.8-alpha-50809';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.