Ticket #53951: 53951-2.diff

src/wp-content/themes/twentytwenty/assets/js/index.js

@@ -632 +632 @@
                         if ( event.key === 'Escape' ) {
                                 document.querySelectorAll( '*[data-untoggle-on-escape].active' ).forEach( function( element ) {
                                         if ( element.classList.contains( 'active' ) ) {
-                                                element.click();
+                                                if ( element.classList.contains( 'search-modal' ) ) {
+                                                        document.querySelectorAll( '.search-toggle', function( element ) {
+//                                                              element.setAttribute( 'aria-expanded', false );
+                                                        } );
+                                                } else {
+                                                        element.click();
+                                                }
                                         }
                                 } );
                         }

src/wp-content/themes/twentytwenty/template-parts/modal-search.php

@@ -8 +8 @@
  */
 
 ?>
-<div class="search-modal cover-modal header-footer-group" data-modal-target-string=".search-modal">
+<div class="search-modal cover-modal header-footer-group" data-modal-target-string=".search-modal" data-untoggle-on-escape="true">
 
         <div class="search-modal-inner modal-inner">