diff --git a/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt b/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt
index 08baf17c60..92e0bb2eae 100644
--- a/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt
@@ -22,10 +22,13 @@ import com.gh.gamecenter.adapter.viewholder.FooterViewHolder
 import com.gh.gamecenter.adapter.viewholder.GameCollectionItemViewHolder
 import com.gh.gamecenter.baselist.ListAdapter
 import com.gh.gamecenter.collection.GamesCollectionFragment.Companion.TYPE_USER
+import com.gh.gamecenter.databinding.ItemGameCollectionFlexTagBinding
 import com.gh.gamecenter.entity.GamesCollectionEntity
+import com.gh.gamecenter.entity.TagInfoEntity
 import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity
 import com.gh.gamecenter.gamecollection.publish.GameCollectionEditActivity
 import com.gh.gamecenter.manager.UserManager
+import com.google.android.flexbox.FlexboxLayout
 
 class GamesCollectionAdapter(
     context: Context,
@@ -78,6 +81,10 @@ class GamesCollectionAdapter(
                         }
                     }
 
+                    if (itemEntity.count?.game ?: 0 == 0) {
+                        initTagsUI(tagContainer, itemEntity.tags ?: arrayListOf())
+                    }
+
                     when {
                         mViewModel.mIsInsertGameCollection -> {
                             userIcon.visibility = View.VISIBLE
@@ -269,6 +276,18 @@ class GamesCollectionAdapter(
         }
     }
 
+    private fun initTagsUI(tagContainer: FlexboxLayout, tags: ArrayList<TagInfoEntity>) {
+        tagContainer.removeAllViews()
+        tags.forEachIndexed { index, tag ->
+            val tagBinding = ItemGameCollectionFlexTagBinding.inflate(LayoutInflater.from(mContext), null, false).apply {
+                root.setPadding(0, 6F.dip2px(), 0, 0)
+                divider.goneIf(index == tags.size - 1)
+                tagNameTv.text = tag.name
+            }
+            tagContainer.addView(tagBinding.root)
+        }
+    }
+
     override fun getSyncData(position: Int): Pair<String, Any>? {
         if (position >= mEntityList.size) return null
         val entity = mEntityList[position]
diff --git a/app/src/main/res/layout/game_collection_item.xml b/app/src/main/res/layout/game_collection_item.xml
index 6cc99c6e8b..e5a252ce86 100644
--- a/app/src/main/res/layout/game_collection_item.xml
+++ b/app/src/main/res/layout/game_collection_item.xml
@@ -140,14 +140,14 @@
             app:layout_constraintLeft_toRightOf="@+id/gameThree" />
 
         <com.google.android.flexbox.FlexboxLayout
-            android:visibility="gone"
+            goneIf="@{entity.count.game != 0}"
             android:id="@+id/tagContainer"
-            android:layout_below="@+id/nameTv"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="14dp"
+            android:layout_marginTop="6dp"
             android:layout_marginLeft="16dp"
-            android:layout_marginRight="82dp"
+            android:layout_marginRight="116dp"
+            android:layout_marginBottom="50dp"
             app:flexWrap="wrap"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintTop_toBottomOf="@+id/nameTv"