diff --git a/templates/player-gallery.php b/templates/player-gallery.php
index ec9d9f51..3fbbf416 100644
--- a/templates/player-gallery.php
+++ b/templates/player-gallery.php
@@ -108,8 +108,10 @@ endif;
 foreach ( $groups as $group ):
 	$i = 0;
 
-	if ( ! empty( $group->name ) )
-		echo '<h3 class="sp-list-group-name">' . $group->name . '</h3>';
+	if ( ! empty( $group->name ) ):
+		$output .= '<a name="group-' . $group->slug . '" id="group-' . $group->slug . '"></a>';
+		$output .= '<h3 class="player-group-name">' . $group->name . '</h3>';
+	endif;
 
 	foreach( $data as $player_id => $performance ): if ( empty( $group->term_id ) || has_term( $group->term_id, 'sp_position', $player_id ) ):
 
diff --git a/templates/player-list.php b/templates/player-list.php
index 376565c2..016dcc53 100644
--- a/templates/player-list.php
+++ b/templates/player-list.php
@@ -65,8 +65,10 @@ endif;
 $output = '';
 
 foreach ( $groups as $group ):
-	if ( ! empty( $group->name ) )
-		$output .= '<h3 class="sp-list-group-name">' . $group->name . '</h3>';
+	if ( ! empty( $group->name ) ):
+		$output .= '<a name="group-' . $group->slug . '" id="group-' . $group->slug . '"></a>';
+		$output .= '<h3 class="player-group-name">' . $group->name . '</h3>';
+	endif;
 
 	$output .= '<div class="sp-table-wrapper sp-scrollable-table-wrapper">' .
 		'<table class="sp-player-list sp-data-table' . ( $responsive ? ' sp-responsive-table' : '' ) . ( $sortable ? ' sp-sortable-table' : '' ) . ( $paginated ? ' sp-paginated-table' : '' ) . '" data-sp-rows="' . $rows . '">' . '<thead>' . '<tr>';