diff --git a/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt
index 5e94096eb..9ddb36bc3 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt
@@ -216,7 +216,7 @@ class ChannelFragment : BaseFragment() {
         chip.visibility = View.VISIBLE
         chip.setOnClickListener {
             binding.tabChips.children.forEach {
-                if (it != chip) it.isSelected = false
+                if (it != chip) (it as Chip).isChecked = false
             }
             scope.launch {
                 val response = try {
@@ -243,7 +243,11 @@ class ChannelFragment : BaseFragment() {
                                 e.printStackTrace()
                                 null
                             }
-                            newContent?.content?.let { adapter.updateItems(it) }
+                            runOnUiThread {
+                                newContent?.content?.let {
+                                    adapter.updateItems(it)
+                                }
+                            }
                         }
                     }
                 }
diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml
index 6d4889444..ab26d98aa 100644
--- a/app/src/main/res/layout/fragment_channel.xml
+++ b/app/src/main/res/layout/fragment_channel.xml
@@ -116,19 +116,20 @@
                 android:padding="10dp" />
 
             <HorizontalScrollView
-                android:id="@+id/tab_chips"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="10dp"
                 android:scrollbars="none">
 
                 <com.google.android.material.chip.ChipGroup
+                    android:id="@+id/tab_chips"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content">
 
                     <com.google.android.material.chip.Chip
                         android:id="@+id/videos"
                         style="@style/channelChip"
+                        android:checked="true"
                         android:text="@string/videos"
                         android:visibility="visible" />