Index: bp-core/bp-core-template.php
===================================================================
--- bp-core/bp-core-template.php	(revision 6407)
+++ bp-core/bp-core-template.php	(working copy)
@@ -716,9 +716,8 @@
 
 	// Loop through active components and look for a match
 	foreach ( $bp->active_components as $component => $id ) {
-		if ( !empty( $bp->{$component}->root_slug ) && ( $bp->{$component}->root_slug == $root_slug ) ) {
+		if ( ( !empty( $bp->{$component}->slug ) && ( $bp->{$component}->slug == $root_slug ) ) || ( !empty( $bp->{$component}->root_slug ) && ( $bp->{$component}->root_slug == $root_slug ) ) )
 			return $bp->{$component}->name;
-		}
 	}
 
 	return false;