diff --git src/bp-activity/classes/class-bp-activity-component.php src/bp-activity/classes/class-bp-activity-component.php
index d54966b49..0d180946d 100644
--- src/bp-activity/classes/class-bp-activity-component.php
+++ src/bp-activity/classes/class-bp-activity-component.php
@@ -367,7 +367,7 @@ class BP_Activity_Component extends BP_Component {
 				'parent'   => 'my-account-' . $this->id,
 				'id'       => 'my-account-' . $this->id . '-personal',
 				'title'    => _x( 'Personal', 'My Account Activity sub nav', 'buddypress' ),
-				'href'     => $activity_link,
+				'href'     => trailingslashit( $activity_link . 'just-me' ),
 				'position' => 10
 			);
 
diff --git src/bp-blogs/classes/class-bp-blogs-component.php src/bp-blogs/classes/class-bp-blogs-component.php
index 854660dda..d735740e0 100644
--- src/bp-blogs/classes/class-bp-blogs-component.php
+++ src/bp-blogs/classes/class-bp-blogs-component.php
@@ -296,7 +296,7 @@ class BP_Blogs_Component extends BP_Component {
 				'parent'   => 'my-account-' . $this->id,
 				'id'       => 'my-account-' . $this->id . '-my-sites',
 				'title'    => __( 'My Sites', 'buddypress' ),
-				'href'     => $blogs_link,
+				'href'     => trailingslashit( $blogs_link . 'my-sites' ),
 				'position' => 10
 			);
 
diff --git src/bp-core/bp-core-buddybar.php src/bp-core/bp-core-buddybar.php
index afbb2f287..336a52ad8 100644
--- src/bp-core/bp-core-buddybar.php
+++ src/bp-core/bp-core-buddybar.php
@@ -325,18 +325,41 @@ function bp_core_new_nav_default( $args = '' ) {
 
 	$parent_nav = reset( $parent_nav );
 
-	if ( ! empty( $parent_nav->screen_function ) ) {
-		// Remove our screen hook if screen function is callable.
-		if ( is_callable( $parent_nav->screen_function ) ) {
-			remove_action( 'bp_screens', $parent_nav->screen_function, 3 );
-		}
-	}
-
 	// Edit the screen function for the parent nav.
-	$bp->members->nav->edit_nav( array(
-		'screen_function'     => &$r['screen_function'],
-		'default_subnav_slug' => $r['subnav_slug'],
-	), $parent_nav->slug );
+	$bp->members->nav->edit_nav(
+		array(
+			'screen_function'     => &$r['screen_function'],
+			'default_subnav_slug' => $r['subnav_slug'],
+		),
+		$parent_nav->slug
+	);
+
+	/**
+	 * Update secondary nav items:
+	 * - The previous default nav item needs to have its slug added to its link property.
+	 * - The new default nav item needs to have its slug removed from its link property.
+	 */
+	$previous_default_subnav = $bp->members->nav->get( $parent_nav->slug . '/' . $parent_nav->default_subnav_slug );
+
+	// Edit the link of the previous default nav item.
+	$bp->members->nav->edit_nav(
+		array(
+			'link' => trailingslashit( $previous_default_subnav->link . $previous_default_subnav->slug ),
+		),
+		$previous_default_subnav->slug,
+		$parent_nav->slug
+	);
+
+	$new_default_subnav = $bp->members->nav->get( $parent_nav->slug . '/' . $r['subnav_slug'] );
+
+	// Edit the link of the new default nav item.
+	$bp->members->nav->edit_nav(
+		array(
+			'link' => rtrim( untrailingslashit( $new_default_subnav->link ), $new_default_subnav->slug ),
+		),
+		$new_default_subnav->slug,
+		$parent_nav->slug
+	);
 
 	if ( bp_is_current_component( $parent_nav->slug ) ) {
 
diff --git src/bp-friends/classes/class-bp-friends-component.php src/bp-friends/classes/class-bp-friends-component.php
index 1921fc70a..287a6f417 100644
--- src/bp-friends/classes/class-bp-friends-component.php
+++ src/bp-friends/classes/class-bp-friends-component.php
@@ -271,7 +271,7 @@ class BP_Friends_Component extends BP_Component {
 				'parent'   => 'my-account-' . $this->id,
 				'id'       => 'my-account-' . $this->id . '-friendships',
 				'title'    => _x( 'Friendships', 'My Account Friends menu sub nav', 'buddypress' ),
-				'href'     => $friends_link,
+				'href'     => trailingslashit( $friends_link . 'my-friends' ),
 				'position' => 10,
 			);
 
diff --git src/bp-groups/classes/class-bp-groups-component.php src/bp-groups/classes/class-bp-groups-component.php
index 2010c274d..df567e36f 100644
--- src/bp-groups/classes/class-bp-groups-component.php
+++ src/bp-groups/classes/class-bp-groups-component.php
@@ -843,7 +843,7 @@ class BP_Groups_Component extends BP_Component {
 				'parent'   => 'my-account-' . $this->id,
 				'id'       => 'my-account-' . $this->id . '-memberships',
 				'title'    => _x( 'Memberships', 'My Account Groups sub nav', 'buddypress' ),
-				'href'     => $groups_link,
+				'href'     => trailingslashit( $groups_link . 'my-groups' ),
 				'position' => 10
 			);
 
diff --git src/bp-members/classes/class-bp-members-component.php src/bp-members/classes/class-bp-members-component.php
index bd078301b..a7deff76d 100644
--- src/bp-members/classes/class-bp-members-component.php
+++ src/bp-members/classes/class-bp-members-component.php
@@ -639,7 +639,7 @@ class BP_Members_Component extends BP_Component {
 					'parent'   => 'my-account-' . $this->id,
 					'id'       => 'my-account-' . $this->id . '-public',
 					'title'    => _x( 'View', 'My Account Profile sub nav', 'buddypress' ),
-					'href'     => $profile_link,
+					'href'     => trailingslashit( $profile_link . 'public' ),
 					'position' => 10
 				);
 
diff --git src/bp-messages/classes/class-bp-messages-component.php src/bp-messages/classes/class-bp-messages-component.php
index 5271c00f6..27e9c46c8 100644
--- src/bp-messages/classes/class-bp-messages-component.php
+++ src/bp-messages/classes/class-bp-messages-component.php
@@ -346,7 +346,7 @@ class BP_Messages_Component extends BP_Component {
 				'parent'   => 'my-account-' . $this->id,
 				'id'       => 'my-account-' . $this->id . '-inbox',
 				'title'    => $inbox,
-				'href'     => $messages_link,
+				'href'     => trailingslashit( $messages_link . 'inbox' ),
 				'position' => 10
 			);
 
diff --git src/bp-notifications/classes/class-bp-notifications-component.php src/bp-notifications/classes/class-bp-notifications-component.php
index 4511b7a05..3fc8b3405 100644
--- src/bp-notifications/classes/class-bp-notifications-component.php
+++ src/bp-notifications/classes/class-bp-notifications-component.php
@@ -257,7 +257,7 @@ class BP_Notifications_Component extends BP_Component {
 				'parent'   => 'my-account-' . $this->id,
 				'id'       => 'my-account-' . $this->id . '-unread',
 				'title'    => $unread,
-				'href'     => $notifications_link,
+				'href'     => trailingslashit( $notifications_link . 'unread' ),
 				'position' => 10,
 			);
 
diff --git src/bp-settings/classes/class-bp-settings-component.php src/bp-settings/classes/class-bp-settings-component.php
index 507eec647..c39bff37e 100644
--- src/bp-settings/classes/class-bp-settings-component.php
+++ src/bp-settings/classes/class-bp-settings-component.php
@@ -259,7 +259,7 @@ class BP_Settings_Component extends BP_Component {
 				'parent'   => 'my-account-' . $this->id,
 				'id'       => 'my-account-' . $this->id . '-general',
 				'title'    => __( 'General', 'buddypress' ),
-				'href'     => $settings_link,
+				'href'     => trailingslashit( $settings_link . 'general' ),
 				'position' => 10,
 			);
 
diff --git src/bp-xprofile/classes/class-bp-xprofile-component.php src/bp-xprofile/classes/class-bp-xprofile-component.php
index 305ebea94..ccd260205 100644
--- src/bp-xprofile/classes/class-bp-xprofile-component.php
+++ src/bp-xprofile/classes/class-bp-xprofile-component.php
@@ -344,7 +344,7 @@ class BP_XProfile_Component extends BP_Component {
 				'parent'   => 'my-account-' . $this->id,
 				'id'       => 'my-account-' . $this->id . '-public',
 				'title'    => _x( 'View', 'My Account Profile sub nav', 'buddypress' ),
-				'href'     => $profile_link,
+				'href'     => trailingslashit( $profile_link . 'public' ),
 				'position' => 10
 			);