Ticket #39101: 39101.2.diff

src/wp-includes/js/customize-selective-refresh.js

@@ -120 +120 @@
                         if ( ! $placementContainer.length || $placementContainer.is( illegalContainerSelector ) || $placementContainer.closest( illegalAncestorSelector ).length ) {
                                 return;
                         }
+                        // Prevent nav_menu widgets from getting an edit shortcut for the nav_menu in addition to the widget shortcut
+                        if ( 'nav_menu' === partial.getType() && $placementContainer.closest( '.widget_nav_menu' ).length ) {
+                                return;
+                        }
                         $shortcut = partial.createEditShortcut();
                         $shortcut.on( 'click', function( event ) {
                                 event.preventDefault();