Ticket #4986: 4986.diff

src/bp-core/bp-core-template.php

@@ -3608 +3608 @@
                                 $submenu->parent = $nav_menu->slug;
 
                                 // If we're viewing this item's screen, record that we need to mark its parent menu to be selected.
-                                if ( $sub_menu->slug == bp_current_action() ) {
+                                // This also checks that the items parent is the current component so that two items with the same slug
+                                // but different parents only selects the parent that is active. See https://buddypress.trac.wordpress.org/ticket/4986
+                                if ( bp_current_action() === $sub_menu->slug && bp_current_component() === $nav_menu->slug ) {
                                         $menu->class[]    = 'current-menu-parent';
                                         $submenu->class[] = 'current-menu-item';
                                 }