diff --git a/app/src/main/res/layout-land/fragment_view_post_detail.xml b/app/src/main/res/layout-land/fragment_view_post_detail.xml
index 2b107e94..3b35b38b 100644
--- a/app/src/main/res/layout-land/fragment_view_post_detail.xml
+++ b/app/src/main/res/layout-land/fragment_view_post_detail.xml
@@ -24,7 +24,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:clipToPadding="false"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"  />
+                app:layoutManager=".customviews.LinearLayoutManagerBugFixed"  />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/comments_recycler_view_view_post_detail_fragment"
@@ -33,7 +33,7 @@
                 android:layout_weight="1"
                 android:paddingBottom="144dp"
                 android:clipToPadding="false"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+                app:layoutManager=".customviews.LinearLayoutManagerBugFixed" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout-sw600dp/fragment_view_post_detail.xml b/app/src/main/res/layout-sw600dp/fragment_view_post_detail.xml
index d7fd9d2a..d1637b0c 100644
--- a/app/src/main/res/layout-sw600dp/fragment_view_post_detail.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_view_post_detail.xml
@@ -24,7 +24,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:clipToPadding="false"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+                app:layoutManager=".customviews.LinearLayoutManagerBugFixed" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/comments_recycler_view_view_post_detail_fragment"
@@ -33,7 +33,7 @@
                 android:layout_weight="1"
                 android:paddingBottom="144dp"
                 android:clipToPadding="false"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+                app:layoutManager=".customviews.LinearLayoutManagerBugFixed" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/exo_rpan_broadcast_playback_control_view.xml b/app/src/main/res/layout/exo_rpan_broadcast_playback_control_view.xml
index c4a571c3..7922dc7a 100644
--- a/app/src/main/res/layout/exo_rpan_broadcast_playback_control_view.xml
+++ b/app/src/main/res/layout/exo_rpan_broadcast_playback_control_view.xml
@@ -142,7 +142,7 @@
         android:paddingEnd="16dp"
         app:layout_constraintTop_toBottomOf="@id/control_linear_layout"
         app:layout_constraintBottom_toTopOf="@id/time_bar_linear_layout"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+        app:layoutManager=".customviews.LinearLayoutManagerBugFixed" />
 
     <LinearLayout
         android:id="@+id/time_bar_linear_layout"