diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 3a0a88048e982f..178f27aa92665f 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -379,7 +379,7 @@ Add custom HTML code and preview it as you edit. ([Source](https://github.com/Wo
 -	**Name:** core/html
 -	**Category:** widgets
 -	**Supports:** interactivity (clientNavigation), ~~className~~, ~~customClassName~~, ~~html~~
--	**Attributes:** content
+-	**Attributes:** content, isPreview
 
 ## Image
 
diff --git a/packages/block-library/src/html/block.json b/packages/block-library/src/html/block.json
index 08587f69bbd460..8ad5e8c86848bc 100644
--- a/packages/block-library/src/html/block.json
+++ b/packages/block-library/src/html/block.json
@@ -11,6 +11,10 @@
 		"content": {
 			"type": "string",
 			"source": "raw"
+		},
+		"isPreview": {
+			"type": "boolean",
+			"default": false
 		}
 	},
 	"supports": {
diff --git a/packages/block-library/src/html/edit.js b/packages/block-library/src/html/edit.js
index 5c57d73ae40f6c..31391811c8312f 100644
--- a/packages/block-library/src/html/edit.js
+++ b/packages/block-library/src/html/edit.js
@@ -2,7 +2,6 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { useContext, useState } from '@wordpress/element';
 import {
 	BlockControls,
 	PlainText,
@@ -10,7 +9,6 @@ import {
 } from '@wordpress/block-editor';
 import {
 	ToolbarButton,
-	Disabled,
 	ToolbarGroup,
 	VisuallyHidden,
 } from '@wordpress/components';
@@ -22,22 +20,10 @@ import { useInstanceId } from '@wordpress/compose';
 import Preview from './preview';
 
 export default function HTMLEdit( { attributes, setAttributes, isSelected } ) {
-	const [ isPreview, setIsPreview ] = useState();
-	const isDisabled = useContext( Disabled.Context );
-
 	const instanceId = useInstanceId( HTMLEdit, 'html-edit-desc' );
-
-	function switchToPreview() {
-		setIsPreview( true );
-	}
-
-	function switchToHTML() {
-		setIsPreview( false );
-	}
-
 	const blockProps = useBlockProps( {
 		className: 'block-library-html__edit',
-		'aria-describedby': isPreview ? instanceId : undefined,
+		'aria-describedby': attributes.isPreview ? instanceId : undefined,
 	} );
 
 	return (
@@ -45,20 +31,20 @@ export default function HTMLEdit( { attributes, setAttributes, isSelected } ) {
 			<BlockControls>
 				<ToolbarGroup>
 					<ToolbarButton
-						isPressed={ ! isPreview }
-						onClick={ switchToHTML }
+						isPressed={ ! attributes.isPreview }
+						onClick={ () => setAttributes( { isPreview: false } ) }
 					>
-						HTML
+						{ __( 'Edit' ) }
 					</ToolbarButton>
 					<ToolbarButton
-						isPressed={ isPreview }
-						onClick={ switchToPreview }
+						isPressed={ attributes.isPreview }
+						onClick={ () => setAttributes( { isPreview: true } ) }
 					>
 						{ __( 'Preview' ) }
 					</ToolbarButton>
 				</ToolbarGroup>
 			</BlockControls>
-			{ isPreview || isDisabled ? (
+			{ attributes.isPreview ? (
 				<>
 					<Preview
 						content={ attributes.content }
diff --git a/packages/edit-site/lib/unbrotli.js b/packages/edit-site/lib/unbrotli.js
index 74d14ded17dfee..a56c85cbec4846 100644
--- a/packages/edit-site/lib/unbrotli.js
+++ b/packages/edit-site/lib/unbrotli.js
@@ -332,12 +332,11 @@
 						0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0,
 						1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,
 						0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0,
-						1, 0, 1, 0, 1, 0, 1, /* UTF8 lead byte range. */
+						1, 0, 1, 0, 1, 0, 1 /* UTF8 lead byte range. */, 2, 3,
 						2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2,
 						3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3,
 						2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2,
-						3, 2, 3, 2, 3, 2, 3,
-						/* CONTEXT_UTF8 second last byte. */
+						3, 2, 3, 2, 3, /* CONTEXT_UTF8 second last byte. */
 						/* ASCII range. */
 						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
@@ -351,11 +350,10 @@
 						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, /* UTF8 lead byte range. */
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2,
+						0, 0, 0, 0 /* UTF8 lead byte range. */, 0, 0, 0, 0, 0,
+						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2,
 						2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-						2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-						/* CONTEXT_SIGNED, second last byte. */
+						2, 2, 2, 2, 2, /* CONTEXT_SIGNED, second last byte. */
 						0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2,
 						2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
 						2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -447,9 +445,8 @@
 
 					exports.lookupOffsets = new Uint16Array( [
 						/* CONTEXT_LSB6 */
-						1024, 1536, /* CONTEXT_MSB6 */
-						1280, 1536, /* CONTEXT_UTF8 */
-						0, 256, /* CONTEXT_SIGNED */
+						1024, 1536 /* CONTEXT_MSB6 */, 1280,
+						1536 /* CONTEXT_UTF8 */, 0, 256 /* CONTEXT_SIGNED */,
 						768, 512,
 					] );
 				},
diff --git a/test/integration/fixtures/blocks/core__html.json b/test/integration/fixtures/blocks/core__html.json
index faa0024b94df43..a34a1b4b78bef9 100644
--- a/test/integration/fixtures/blocks/core__html.json
+++ b/test/integration/fixtures/blocks/core__html.json
@@ -3,7 +3,8 @@
 		"name": "core/html",
 		"isValid": true,
 		"attributes": {
-			"content": "<h1>Some HTML code</h1>\n<div>This is a div</div>"
+			"content": "<h1>Some HTML code</h1>\n<div>This is a div</div>",
+			"isPreview": false
 		},
 		"innerBlocks": []
 	}