diff --git a/lib/compat/wordpress-6.8/admin-bar.php b/lib/compat/wordpress-6.8/admin-bar.php
new file mode 100644
index 0000000000000..0c56ada0a2897
--- /dev/null
+++ b/lib/compat/wordpress-6.8/admin-bar.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Changes to the WordPress admin bar.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Adds the "Site Editor" link to the Toolbar.
+ *
+ * @since 5.9.0
+ * @since 6.3.0 Added `$_wp_current_template_id` global for editing of current template directly from the admin bar.
+ * @since 6.6.0 Added the canvas argument to the url.
+ * @since 6.8.0 Changed to open Site Editor at top level instead of specific template.
+ *
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
+ */
+function gutenberg_wp_admin_bar_edit_site_menu( $wp_admin_bar ) {
+	// Don't show if a block theme is not activated.
+	if ( ! wp_is_block_theme() ) {
+		return;
+	}
+
+	// Don't show for users who can't edit theme options or when in the admin.
+	if ( ! current_user_can( 'edit_theme_options' ) || is_admin() || ( is_blog_admin() && is_multisite() && current_user_can( 'manage_sites' ) ) ) {
+		return;
+	}
+
+	$wp_admin_bar->add_node(
+		array(
+			'id'    => 'site-editor',
+			'title' => __( 'Edit site' ),
+			'href'  => admin_url( 'site-editor.php' ),
+		)
+	);
+}
+
+add_action( 'admin_bar_menu', 'gutenberg_wp_admin_bar_edit_site_menu', 41 );
diff --git a/lib/load.php b/lib/load.php
index 371f9c54e5fc4..893d94c41d265 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -101,6 +101,7 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-6.8/post.php';
 require __DIR__ . '/compat/wordpress-6.8/site-editor.php';
 require __DIR__ . '/compat/wordpress-6.8/class-gutenberg-rest-user-controller.php';
+require __DIR__ . '/compat/wordpress-6.8/admin-bar.php';
 
 // Experimental features.
 require __DIR__ . '/experimental/block-editor-settings-mobile.php';
diff --git a/packages/block-library/src/image/block.json b/packages/block-library/src/image/block.json
index 16e3121747602..26835df9e856c 100644
--- a/packages/block-library/src/image/block.json
+++ b/packages/block-library/src/image/block.json
@@ -4,7 +4,14 @@
 	"name": "core/image",
 	"title": "Image",
 	"category": "media",
-	"usesContext": [ "allowResize", "imageCrop", "fixedHeight", "postId", "postType", "queryId" ],
+	"usesContext": [
+		"allowResize",
+		"imageCrop",
+		"fixedHeight",
+		"postId",
+		"postType",
+		"queryId"
+	],
 	"description": "Insert an image to make a visual statement.",
 	"keywords": [ "img", "photo", "picture" ],
 	"textdomain": "default",
diff --git a/packages/block-library/src/post-content/block.json b/packages/block-library/src/post-content/block.json
index ed9c47154b2f8..e5d455b97a8a3 100644
--- a/packages/block-library/src/post-content/block.json
+++ b/packages/block-library/src/post-content/block.json
@@ -69,4 +69,4 @@
 	},
 	"style": "wp-block-post-content",
 	"editorStyle": "wp-block-post-content-editor"
-}
\ No newline at end of file
+}