diff --git a/wp-includes/class-wp-fatal-error-handler.php b/wp-includes/class-wp-fatal-error-handler.php
index 270bb9e444..f041e19dd5 100644
--- a/wp-includes/class-wp-fatal-error-handler.php
+++ b/wp-includes/class-wp-fatal-error-handler.php
@@ -42,7 +42,7 @@ class WP_Fatal_Error_Handler {
 			}
 
 			// Display the PHP error template if headers not sent.
-			if ( ! headers_sent() ) {
+			if ( is_admin() || ! headers_sent() ) {
 				$this->display_error_template( $error );
 			}
 		} catch ( Exception $e ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7769b6ab8a..f88382c628 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.2-beta3-45209';
+$wp_version = '5.2-beta3-45210';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.