diff --git a/agent/clients.php b/agent/clients.php
index 3ce938e0..433dff02 100644
--- a/agent/clients.php
+++ b/agent/clients.php
@@ -389,7 +389,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         $client_tag_id_array[] = $client_tag_id;
                         $client_tag_name_display_array[] = "<a href='clients.php?tags[]=$client_tag_id'><span class='mt-1 badge badge-pill text-light p-1 mr-1' style='background-color: $client_tag_color;'><i class='fas fa-$client_tag_icon fa-fw mr-1'></i>$client_tag_name</span></a>";
                     }
-                    $client_tags_display = implode('', $client_tag_name_display_array);
+                    $client_tags_display = '';
+                    foreach (array_chunk($client_tag_name_display_array, 3) as $tag_row) {
+                        $client_tags_display .= "<div class='d-flex flex-wrap'>" . implode('', $tag_row) . "</div>";
+                    }
 
                     //Add up all the payments for the invoice and get the total amount paid to the invoice
                     $sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status != 'Draft' AND invoice_status != 'Cancelled' AND invoice_status != 'Non-Billable' ");