diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 21adc11f..143c4f79 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -53,6 +53,7 @@ dependencies {
   implementation(Dependencies.AndroidX.Lifecycle.viewmodelKtx)
   implementation(Dependencies.Kotlin.Coroutines.android)
   implementation(Dependencies.ThirdParty.accompanist)
+  implementation(Dependencies.ThirdParty.composeFlowLayout)
   implementation(Dependencies.ThirdParty.Moshi.lib)
   implementation(Dependencies.ThirdParty.Retrofit.moshi)
   implementation(Dependencies.ThirdParty.SQLDelight.androidDriver)
diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt
index b54e28b9..c97aadc8 100644
--- a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt
+++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt
@@ -30,6 +30,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil.transform.CircleCropTransformation
+import com.star_zero.compose.flowlayout.FlowLayout
 import dev.chrisbanes.accompanist.coil.CoilImage
 import dev.msfjarvis.lobsters.R
 import dev.msfjarvis.lobsters.data.api.LobstersApi
@@ -131,11 +132,12 @@ fun TagRow(
   tags: List<String>,
   modifier: Modifier = Modifier,
 ) {
-  Row(
+  FlowLayout(
     modifier = Modifier.then(modifier),
-    horizontalArrangement = Arrangement.spacedBy(8.dp),
+    horizontalSpacing = 8.dp,
+    verticalSpacing = 8.dp,
   ) {
-    tags.take(3).forEach { tag ->
+    tags.forEach { tag ->
       Text(
         text = tag,
         modifier = Modifier
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index cc416383..160309da 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -66,6 +66,7 @@ object Dependencies {
   object ThirdParty {
 
     const val accompanist = "dev.chrisbanes.accompanist:accompanist-coil:0.6.1"
+    const val composeFlowLayout = "com.star-zero:compose-flowlayout:0.0.1"
 
     object Moshi {