diff --git a/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/class-plugin.php b/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/class-plugin.php
index 161c3e090e..d068a15547 100644
--- a/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/class-plugin.php
+++ b/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/class-plugin.php
@@ -67,6 +67,7 @@ private function __construct() {
 	function plugins_loaded() {
 		add_filter( 'gp_url_profile', array( $this, 'worg_profile_url' ), 10, 2 );
 		add_filter( 'gp_projects', array( $this, 'natural_sort_projects' ), 10, 2 );
+		add_filter( 'gp_breadcrumb_items', array( $this, 'merge_directory_breadcrumbs' ), 5 );
 		add_action( 'gp_project_created', array( $this, 'update_projects_last_updated' ) );
 		add_action( 'gp_project_saved', array( $this, 'update_projects_last_updated' ) );
 		add_filter( 'pre_handle_404', array( $this, 'short_circuit_handle_404' ) );
@@ -758,6 +759,43 @@ public function worg_profile_url( $url, $nicename ) {
 		return 'https://profiles.wordpress.org/' . $nicename . '/';
 	}
 
+	/**
+	 * Merges the Plugins and Themes breadcrumbs into the project breadcrumb that follows them.
+	 *
+	 * The wp-plugins and wp-themes archives redirect to the homepage, so they shouldn't be linked.
+	 * Without a project link to merge into, the label is kept as plain text.
+	 *
+	 * @param string[] $items Breadcrumb items as HTML strings.
+	 * @return string[] Filtered breadcrumb items.
+	 */
+	public function merge_directory_breadcrumbs( $items ) {
+		$items = array_values( $items );
+
+		foreach ( $items as $index => $item ) {
+			if ( ! isset( $items[ $index + 1 ] ) ) {
+				break;
+			}
+
+			foreach ( array( 'wp-plugins', 'wp-themes' ) as $path ) {
+				$url = esc_url( gp_url_project( $path ) );
+
+				if ( ! str_starts_with( $item, '<a href="' . $url . '"' ) ) {
+					continue;
+				}
+
+				// Only merge into a link to one of the directory's projects, not plain text like "Edit".
+				if ( str_starts_with( $items[ $index + 1 ], '<a href="' . $url ) ) {
+					$items[ $index + 1 ] = wp_strip_all_tags( $item ) . ': ' . $items[ $index + 1 ];
+					unset( $items[ $index ] );
+				} else {
+					$items[ $index ] = wp_strip_all_tags( $item );
+				}
+			}
+		}
+
+		return array_values( $items );
+	}
+
 	/**
 	 * Natural sorting for sub-projects, and attach whitelisted meta.
 	 *
diff --git a/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/projects-wp-plugins.php b/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/projects-wp-plugins.php
index 7aa30aab79..20c06cfa5b 100644
--- a/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/projects-wp-plugins.php
+++ b/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/projects-wp-plugins.php
@@ -10,7 +10,13 @@
 ];
 
 gp_title( sprintf( __( '%s &lt; GlotPress' ), esc_html( $project->name ) ) );
-gp_breadcrumb_project( $project );
+// The Plugins archive redirects to the homepage, so its crumb is merged into the project name.
+gp_breadcrumb(
+	array(
+		gp_link_get( gp_url( '/projects' ), __( 'Projects', 'glotpress' ) ),
+		'Plugins: ' . esc_html( $project->name ),
+	)
+);
 
 gp_enqueue_script( 'common' );
 gp_enqueue_script( 'tablesorter' );
diff --git a/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/projects-wp-themes.php b/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/projects-wp-themes.php
index 9b8669b13c..8b88256b7f 100644
--- a/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/projects-wp-themes.php
+++ b/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/projects-wp-themes.php
@@ -7,7 +7,13 @@
 ];
 
 gp_title( sprintf( __( '%s &lt; GlotPress' ), esc_html( $project->name ) ) );
-gp_breadcrumb_project( $project );
+// The Themes archive redirects to the homepage, so its crumb is merged into the project name.
+gp_breadcrumb(
+	array(
+		gp_link_get( gp_url( '/projects' ), __( 'Projects', 'glotpress' ) ),
+		'Themes: ' . esc_html( $project->name ),
+	)
+);
 
 gp_enqueue_script( 'common' );
 gp_enqueue_script( 'tablesorter' );