diff --git a/app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt
index 835c658cf..75a985a43 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt
@@ -104,7 +104,7 @@ class SearchAdapter(
                     .show(childFragmentManager, VideoOptionsBottomSheet::class.java.name)
                 true
             }
-            channelImage.setOnClickListener {
+            channelContainer.setOnClickListener {
                 NavigationHelper.navigateChannel(root.context, item.uploaderUrl)
             }
             watchProgress.setWatchProgressLength(videoId, item.duration!!)
diff --git a/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt
index 46d3a9254..c7bd5bfd8 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt
@@ -126,7 +126,7 @@ class VideosAdapter(
                 ImageHelper.loadImage(video.uploaderAvatar, channelImage)
                 channelName.text = video.uploaderName
 
-                channelImage.setOnClickListener {
+                channelContainer.setOnClickListener {
                     NavigationHelper.navigateChannel(root.context, video.uploaderUrl)
                 }
             }
diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml
index 25f028b28..2f77da5df 100644
--- a/app/src/main/res/layout/fragment_channel.xml
+++ b/app/src/main/res/layout/fragment_channel.xml
@@ -33,9 +33,9 @@
 
                 <de.hdodenhof.circleimageview.CircleImageView
                     android:id="@+id/channel_image"
-                    android:layout_width="50dp"
-                    android:layout_height="50dp"
-                    android:layout_gravity="center_horizontal" />
+                    android:layout_width="45dp"
+                    android:layout_height="45dp"
+                    android:layout_gravity="center" />
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -47,7 +47,7 @@
 
                     <TextView
                         android:id="@+id/channel_name"
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="start"
                         android:layout_marginTop="3.5dp"
diff --git a/app/src/main/res/layout/video_row.xml b/app/src/main/res/layout/video_row.xml
index 12a50d10d..ee8c71d39 100644
--- a/app/src/main/res/layout/video_row.xml
+++ b/app/src/main/res/layout/video_row.xml
@@ -89,6 +89,7 @@
         app:layout_constraintTop_toBottomOf="@id/video_title" />
 
     <LinearLayout
+        android:id="@+id/channel_container"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="8dp"