diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php
index 5fe00e9801..3765c1fb45 100644
--- a/wp-includes/admin-bar.php
+++ b/wp-includes/admin-bar.php
@@ -458,21 +458,19 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) {
  * @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` query arg to the Site Editor link.
- *
- * @global string $_wp_current_template_id
+ * @since 6.8.0 Removed the query args to ensure that the link opens the starting screen of the Site Editor.
  *
  * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
  */
 function wp_admin_bar_edit_site_menu( $wp_admin_bar ) {
-	global $_wp_current_template_id;
 
 	// 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() ) {
+	// Don't show for users who can't edit theme options.
+	if ( ! current_user_can( 'edit_theme_options' ) ) {
 		return;
 	}
 
@@ -480,14 +478,7 @@ function wp_admin_bar_edit_site_menu( $wp_admin_bar ) {
 		array(
 			'id'    => 'site-editor',
 			'title' => __( 'Edit Site' ),
-			'href'  => add_query_arg(
-				array(
-					'postType' => 'wp_template',
-					'postId'   => $_wp_current_template_id,
-					'canvas'   => 'edit',
-				),
-				admin_url( 'site-editor.php' )
-			),
+			'href'  => admin_url( 'site-editor.php' ),
 		)
 	);
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0d57f6c98c..e0117016a5 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.8-alpha-59909';
+$wp_version = '6.8-alpha-59910';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.