diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php
index 4fdd3ac1e2..f09277c173 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php
@@ -225,7 +225,7 @@ class WP_REST_Widget_Types_Controller extends WP_REST_Controller {
 			}
 			$widget['classname'] = ltrim( $classname, '_' );
 
-			$widgets[] = $widget;
+			$widgets[ $widget['id'] ] = $widget;
 		}
 
 		return $widgets;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6a22a2501a..20301c80da 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.8-alpha-51048';
+$wp_version = '5.8-alpha-51049';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.