diff --git bp-themes/bp-default/_inc/global.js bp-themes/bp-default/_inc/global.js
index c62d161..ded0663 100644
--- bp-themes/bp-default/_inc/global.js
+++ bp-themes/bp-default/_inc/global.js
@@ -449,7 +449,16 @@ jq(document).ready( function() {
 
 					/* Decrease the "Reply (X)" button count */
 					var parent_li = comment_li.parents('ul#activity-stream > li');
-					jq('li#' + parent_li.attr('id') + ' a.acomment-reply span').html( jq('li#' + parent_li.attr('id') + ' a.acomment-reply span').html() - ( 1 + child_count ) );
+					var count_span = jq('li#' + parent_li.attr('id') + ' a.acomment-reply span');
+					var current_count = jq(count_span).html();
+
+					var new_count = current_count - ( 1 + child_count );
+					jq(count_span).html(new_count);
+
+					/* If that was the last comment for the item, remove the has-comments class to clean up the styling */
+					if ( 0 == new_count ) {
+						jq(comment_li.parents('ul#activity-stream > li')).removeClass('has-comments');
+					}
 				}
 			});