diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/CategoryProductHelper.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/CategoryProductHelper.kt
index 6fdde04b89de..e33087cb69e5 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/CategoryProductHelper.kt
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/CategoryProductHelper.kt
@@ -43,8 +43,10 @@ object CategoryProductHelper {
             .append(" ")
             .apply {
                 // Add all the categories to text view and link them to wikidata is possible
-                append(categories.joinToString { getCategoriesTag(it, fragment, apiClient) })
-
+                categories.map { getCategoriesTag(it, fragment, apiClient) }.forEachIndexed { i, el ->
+                    append(el)
+                    if (i != categories.size) append(", ")
+                }
             }
 
         if (categories.any { it.categoryTag == "en:alcoholic-beverages" }) {
@@ -56,7 +58,7 @@ object CategoryProductHelper {
         category: CategoryName,
         fragment: BaseFragment,
         apiClient: WikiDataApiClient
-    ): CharSequence {
+    ): SpannableStringBuilder {
         val clickableSpan = object : ClickableSpan() {
             override fun onClick(view: View) {
                 if (category.isWikiDataIdPresent == true) {