Index: src/bp-friends/bp-friends-template.php
===================================================================
--- src/bp-friends/bp-friends-template.php
+++ src/bp-friends/bp-friends-template.php
@@ -291,14 +291,19 @@
 	 * @return string HTML for the Add Friend button.
 	 */
 	function bp_get_add_friend_button( $potential_friend_id = 0, $friend_status = false ) {
+		global $members_template;
 
-		if ( empty( $potential_friend_id ) )
+		if ( empty( $potential_friend_id ) ) {
 			$potential_friend_id = bp_get_potential_friend_id( $potential_friend_id );
+		}
 
 		$is_friend = bp_is_friend( $potential_friend_id );
 
-		if ( empty( $is_friend ) )
+		if ( empty( $is_friend ) ) {
 			return false;
+		}
+
+		$block_self = ! empty( $members_template->in_the_loop ) ? false : true;
 
 		switch ( $is_friend ) {
 			case 'pending' :
@@ -306,7 +311,7 @@
 					'id'                => 'pending',
 					'component'         => 'friends',
 					'must_be_logged_in' => true,
-					'block_self'        => true,
+					'block_self'        => $block_self,
 					'wrapper_class'     => 'friendship-button pending_friend',
 					'wrapper_id'        => 'friendship-button-' . $potential_friend_id,
 					'link_href'         => wp_nonce_url( bp_loggedin_user_domain() . bp_get_friends_slug() . '/requests/cancel/' . $potential_friend_id . '/', 'friends_withdraw_friendship' ),
@@ -323,7 +328,7 @@
 					'id'                => 'awaiting_response',
 					'component'         => 'friends',
 					'must_be_logged_in' => true,
-					'block_self'        => true,
+					'block_self'        => $block_self,
 					'wrapper_class'     => 'friendship-button awaiting_response_friend',
 					'wrapper_id'        => 'friendship-button-' . $potential_friend_id,
 					'link_href'         => bp_loggedin_user_domain() . bp_get_friends_slug() . '/requests/',
@@ -340,7 +345,7 @@
 					'id'                => 'is_friend',
 					'component'         => 'friends',
 					'must_be_logged_in' => true,
-					'block_self'        => false,
+					'block_self'        => $block_self,
 					'wrapper_class'     => 'friendship-button is_friend',
 					'wrapper_id'        => 'friendship-button-' . $potential_friend_id,
 					'link_href'         => wp_nonce_url( bp_loggedin_user_domain() . bp_get_friends_slug() . '/remove-friend/' . $potential_friend_id . '/', 'friends_remove_friend' ),
@@ -357,7 +362,7 @@
 					'id'                => 'not_friends',
 					'component'         => 'friends',
 					'must_be_logged_in' => true,
-					'block_self'        => true,
+					'block_self'        => $block_self,
 					'wrapper_class'     => 'friendship-button not_friends',
 					'wrapper_id'        => 'friendship-button-' . $potential_friend_id,
 					'link_href'         => wp_nonce_url( bp_loggedin_user_domain() . bp_get_friends_slug() . '/add-friend/' . $potential_friend_id . '/', 'friends_add_friend' ),