diff --git wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php
index d6ee6ec5e..cd8ecc619 100644
--- wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php
+++ wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php
@@ -495,7 +495,7 @@ class Plugin_Directory {
 		) );
 
 		// Add the browse/* views.
-		add_rewrite_tag( '%browse%', '(featured|popular|beta|blocks|new|favorites)' );
+		add_rewrite_tag( '%browse%', '(featured|popular|beta|blocks|new|favorites|adopt-me)' );
 		add_permastruct( 'browse', 'browse/%browse%' );
 
 		// Create an archive for a users favorites too.
@@ -731,7 +731,7 @@ class Plugin_Directory {
 
 		// For any invalid values passed to browse, set it to featured instead
 		if ( !empty ( $wp_query->query ['browse'] ) &&
-		     !in_array( $wp_query->query['browse'], array( 'featured','popular','beta','blocks','new','favorites' ) ) ) {
+		     !in_array( $wp_query->query['browse'], array( 'featured','popular','beta','blocks','new','favorites','adopt-me' ) ) ) {
 			 $wp_query->query['browse'] = 'featured';
 			 $wp_query->query_vars['browse'] = 'featured';
 		}
@@ -775,7 +775,7 @@ class Plugin_Directory {
 		}
 
 		// For /browse/ requests, we conditionally need to avoid querying the taxonomy for most views (as it's handled in code above)
-		if ( isset( $wp_query->query['browse'] ) && ! in_array( $wp_query->query['browse'], array( 'beta', 'blocks', 'featured' ) ) ) {
+		if ( isset( $wp_query->query['browse'] ) && ! in_array( $wp_query->query['browse'], array( 'beta', 'blocks', 'featured', 'adopt-me' ) ) ) {
 			unset( $wp_query->query_vars['browse'] );
 
 			add_filter( 'the_posts', function( $posts, $wp_query ) {
diff --git wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php
index d407c1295..59c9efa4a 100644
--- wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php
+++ wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php
@@ -123,6 +123,8 @@ class Import {
 
 		if ( in_array( 'adopt-me', $readme->tags ) ) {
 			wp_set_object_terms( $plugin->ID, 'adopt-me', 'plugin_section' );
+		} else {
+			wp_remove_object_terms( $plugin->ID, 'adopt-me', 'plugin_section' );
 		}
 
 		// Update the tested-up-to value
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-sidebar-advanced.php wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-sidebar-advanced.php
index d56cf51bf..1b30dc89d 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-sidebar-advanced.php
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-sidebar-advanced.php
@@ -14,7 +14,7 @@ $widget_args = array(
 	'after_title'  => '</h4>',
 );
 
-//the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Adopt_Me', array(), $widget_args );
+the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Adopt_Me', array(), $widget_args );
 the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Meta', array(), $widget_args );
 the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Ratings', array(), $widget_args );
 the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Support', array(), $widget_args );
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-sidebar.php wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-sidebar.php
index 5778b75c3..ee54abe58 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-sidebar.php
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-sidebar.php
@@ -14,7 +14,7 @@ $widget_args = array(
 	'after_title'  => '</h3>',
 );
 
-//the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Adopt_Me', array(), $widget_args );
+the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Adopt_Me', array(), $widget_args );
 the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Meta', array(), $widget_args );
 the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Ratings', array(), $widget_args );
 the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Contributors', array(), array(