diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php
index 47af07e01..628858bad 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php
@@ -72,7 +72,10 @@ function wporg_themes_scripts() {
 			'query'    => wporg_themes_get_themes_for_query(),
 			'settings' => array(
 				/* translators: %s: theme name */
-				'title'        => __( '%s | WordPress.org', 'wporg-themes' ),
+				'title'        => array(
+					'default' => __( '%s | WordPress.org', 'wporg-themes' ),
+					'theme'   => '%s - ' . sprintf( __( '%s | WordPress.org', 'wporg-themes' ), __( 'WordPress theme', 'wporg-themes' ) ),
+				),
 				'isMobile'     => wp_is_mobile(),
 				'postsPerPage' => 24,
 				'path'         => trailingslashit( parse_url( home_url(), PHP_URL_PATH ) ),
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js
index faf9d4e00..8e58ae214 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js
@@ -16,8 +16,13 @@ window.wp = window.wp || {};
 	_.extend( themes, { model: {}, view: {}, routes: {}, router: {}, template: wp.template });
 
 	themes.utils = {
-		title: function ( item ) {
-			document.title = $( '<div/>' ).html( themes.data.settings.title.replace( '%s', $( '<div/>' ).text(item).html() ) ).text();
+		title: function ( item, isTheme ) {
+			var format = !!isTheme ? themes.data.settings.title.theme : themes.data.settings.title.default;
+			var title  = $( '<div/>' ).html( format.replace( '%s', $( '<div/>' ).text( item ).html() ) ).text();
+
+			if ( document.title !== title ) {
+				document.title = title;
+			}
 		}
 	};
 
@@ -1131,7 +1136,7 @@ window.wp = window.wp || {};
 
 			// Trigger a route update for the current model
 			themes.router.navigate( themes.router.baseUrl( themes.router.themePath + this.model.id ) );
-			themes.utils.title( this.model.attributes.name );
+			themes.utils.title( this.model.attributes.name, true );
 
 			// Sets this.view to 'detail'
 			this.setView( 'detail' );