From e0a2ef26affbb3ae5c0f60fbb56c80e4e49a028d Mon Sep 17 00:00:00 2001
From: Rishabh Gupta <rishabh.gupta@rtcamp.com>
Date: Wed, 17 Sep 2025 11:47:37 +0530
Subject: [PATCH] Accessibility: Add aria-haspopup and aria-controls to Add
 Media button

---
 src/wp-admin/includes/media.php    | 2 +-
 src/wp-includes/media-template.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-admin/includes/media.php b/src/wp-admin/includes/media.php
index 5fda1d9de2733..302395c729a00 100644
--- a/src/wp-admin/includes/media.php
+++ b/src/wp-admin/includes/media.php
@@ -655,7 +655,7 @@ function media_buttons( $editor_id = 'content' ) {
 	$id_attribute = 1 === $instance ? ' id="insert-media-button"' : '';
 
 	printf(
-		'<button type="button"%s class="button insert-media add_media" data-editor="%s">%s</button>',
+		'<button type="button"%s class="button insert-media add_media" data-editor="%s" aria-haspopup="dialog" aria-controls="wp-media-modal">%s</button>',
 		$id_attribute,
 		esc_attr( $editor_id ),
 		$img . __( 'Add Media' )
diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php
index 4e7592bd74d06..b75db5920cb0c 100644
--- a/src/wp-includes/media-template.php
+++ b/src/wp-includes/media-template.php
@@ -195,7 +195,7 @@ function wp_print_media_templates() {
 
 	<?php // Template for the media modal. ?>
 	<script type="text/html" id="tmpl-media-modal">
-		<div tabindex="0" class="<?php echo $class; ?>" role="dialog" aria-labelledby="media-frame-title">
+		<div id="wp-media-modal" tabindex="0" class="<?php echo $class; ?>" role="dialog" aria-labelledby="media-frame-title">
 			<# if ( data.hasCloseButton ) { #>
 				<button type="button" class="media-modal-close"><span class="media-modal-icon"><span class="screen-reader-text">
 					<?php