diff --git a/app/src/main/res/layout/conversation_list_fragment.xml b/app/src/main/res/layout/conversation_list_fragment.xml
index 63fd81aebf..e9c7433989 100644
--- a/app/src/main/res/layout/conversation_list_fragment.xml
+++ b/app/src/main/res/layout/conversation_list_fragment.xml
@@ -101,59 +101,65 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/banner_barrier">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+        <androidx.core.widget.NestedScrollView
             android:layout_gravity="bottom|end"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:gravity="end"
-            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             app:layout_behavior="org.thoughtcrime.securesms.util.views.SlideUpWithSnackbarBehavior">
 
-            <org.thoughtcrime.securesms.components.registration.PulsingFloatingActionButton
-                android:id="@+id/camera_fab"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginBottom="20dp"
-                android:contentDescription="@string/conversation_list_fragment__open_camera_description"
-                android:focusable="true"
-                android:theme="@style/Widget.Material3.FloatingActionButton.Secondary"
-                android:transitionName="camera_fab"
-                android:visibility="gone"
-                app:backgroundTint="@color/signal_colorSurfaceVariant"
-                app:srcCompat="@drawable/symbol_camera_24"
-                app:tint="@color/signal_colorOnSurface"
-                app:shapeAppearanceOverlay="@style/Signal.ShapeOverlay.Rounded.Fab"
-                tools:visibility="visible" />
-
-            <org.thoughtcrime.securesms.components.registration.PulsingFloatingActionButton
-                android:id="@+id/fab"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
-                android:layout_marginBottom="16dp"
-                android:contentDescription="@string/conversation_list_fragment__fab_content_description"
-                android:focusable="true"
-                android:theme="@style/Widget.Material3.FloatingActionButton.Secondary"
-                android:transitionName="new_convo_fab"
-                android:visibility="gone"
-                app:backgroundTint="@color/signal_colorPrimaryContainer"
-                app:srcCompat="@drawable/symbol_edit_24"
-                app:tint="@color/signal_colorOnSurface"
-                app:shapeAppearanceOverlay="@style/Signal.ShapeOverlay.Rounded.Fab"
-                tools:visibility="visible" />
-
-            <ViewStub
-                android:id="@+id/megaphone_container"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout="@layout/conversation_list_megaphone_container"
-                app:layout_constraintBottom_toBottomOf="parent" />
+                android:clipChildren="false"
+                android:clipToPadding="false"
+                android:gravity="end"
+                android:orientation="vertical">
 
-        </LinearLayout>
+                <org.thoughtcrime.securesms.components.registration.PulsingFloatingActionButton
+                    android:id="@+id/camera_fab"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginBottom="20dp"
+                    android:contentDescription="@string/conversation_list_fragment__open_camera_description"
+                    android:focusable="true"
+                    android:theme="@style/Widget.Material3.FloatingActionButton.Secondary"
+                    android:transitionName="camera_fab"
+                    android:visibility="gone"
+                    app:backgroundTint="@color/signal_colorSurfaceVariant"
+                    app:shapeAppearanceOverlay="@style/Signal.ShapeOverlay.Rounded.Fab"
+                    app:srcCompat="@drawable/symbol_camera_24"
+                    app:tint="@color/signal_colorOnSurface"
+                    tools:visibility="visible" />
+
+                <org.thoughtcrime.securesms.components.registration.PulsingFloatingActionButton
+                    android:id="@+id/fab"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginBottom="16dp"
+                    android:contentDescription="@string/conversation_list_fragment__fab_content_description"
+                    android:focusable="true"
+                    android:theme="@style/Widget.Material3.FloatingActionButton.Secondary"
+                    android:transitionName="new_convo_fab"
+                    android:visibility="gone"
+                    app:backgroundTint="@color/signal_colorPrimaryContainer"
+                    app:shapeAppearanceOverlay="@style/Signal.ShapeOverlay.Rounded.Fab"
+                    app:srcCompat="@drawable/symbol_edit_24"
+                    app:tint="@color/signal_colorOnSurface"
+                    tools:visibility="visible" />
+
+                <ViewStub
+                    android:id="@+id/megaphone_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout="@layout/conversation_list_megaphone_container"
+                    app:layout_constraintBottom_toBottomOf="parent" />
+
+            </LinearLayout>
+
+        </androidx.core.widget.NestedScrollView>
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>