diff --git a/app/src/main/java/org/mozilla/fenix/share/ShareToAppsView.kt b/app/src/main/java/org/mozilla/fenix/share/ShareToAppsView.kt
index 415fa0ad50..93c7c7bc63 100644
--- a/app/src/main/java/org/mozilla/fenix/share/ShareToAppsView.kt
+++ b/app/src/main/java/org/mozilla/fenix/share/ShareToAppsView.kt
@@ -45,6 +45,7 @@ class ShareToAppsView(
 
     fun setRecentShareTargets(recentTargets: List<AppShareOption>) {
         if (recentTargets.isEmpty()) {
+            recentAppsContainer.visibility = View.GONE
             return
         }
         progressBar.visibility = View.GONE
diff --git a/app/src/main/res/layout/share_to_apps.xml b/app/src/main/res/layout/share_to_apps.xml
index 0b69e97239..c9df0d4ef5 100644
--- a/app/src/main/res/layout/share_to_apps.xml
+++ b/app/src/main/res/layout/share_to_apps.xml
@@ -1,84 +1,91 @@
-<?xml version="1.0" encoding="utf-8"?><!-- This Source Code Form is subject to the terms of the Mozilla Public
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <ProgressBar
-        android:id="@+id/progressBar"
-        android:layout_width="76dp"
-        android:layout_height="37dp"
-        android:layout_marginTop="@dimen/share_progress_bar_margin"
-        android:layout_marginBottom="@dimen/share_progress_bar_margin"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/apps_link_header" />
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal">
 
-    <LinearLayout
-        android:id="@+id/recentAppsContainer"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/apps_layout"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/share_recent_apps_margin"
-        android:layout_marginTop="@dimen/share_recent_apps_margin"
-        android:layout_marginBottom="@dimen/share_recent_apps_margin"
-        android:background="@drawable/recent_apps_background"
-        android:orientation="vertical"
-        android:paddingTop="@dimen/share_recent_apps_padding"
-        android:visibility="gone"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_height="wrap_content">
+
+        <ProgressBar
+            android:id="@+id/progressBar"
+            android:layout_width="76dp"
+            android:layout_height="37dp"
+            android:layout_marginTop="@dimen/share_progress_bar_margin"
+            android:layout_marginBottom="@dimen/share_progress_bar_margin"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/apps_link_header" />
+
+        <LinearLayout
+            android:id="@+id/recentAppsContainer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/share_recent_apps_margin"
+            android:layout_marginTop="@dimen/share_recent_apps_margin"
+            android:layout_marginBottom="@dimen/share_recent_apps_margin"
+            android:background="@drawable/recent_apps_background"
+            android:orientation="vertical"
+            android:paddingTop="@dimen/share_recent_apps_padding"
+            android:visibility="gone"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <TextView
+                android:id="@+id/recent_apps_link_header"
+                style="@style/ShareHeaderTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="@dimen/share_recent_apps_padding"
+                android:paddingEnd="@dimen/share_recent_apps_padding"
+                android:text="@string/share_link_recent_apps_subheader" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recentAppsList"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:clipToPadding="false"
+                android:minHeight="@dimen/share_list_min_height"
+                android:orientation="horizontal"
+                app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                app:spanCount="2" />
+
+        </LinearLayout>
 
         <TextView
-            android:id="@+id/recent_apps_link_header"
-            android:paddingStart="@dimen/share_recent_apps_padding"
-            android:paddingEnd="@dimen/share_recent_apps_padding"
+            android:id="@+id/apps_link_header"
             style="@style/ShareHeaderTextStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/share_link_recent_apps_subheader" />
+            android:layout_marginStart="@dimen/share_all_apps_header_margin"
+            android:layout_marginTop="@dimen/share_all_apps_header_margin"
+            android:text="@string/share_link_all_apps_subheader"
+            app:layout_constraintStart_toEndOf="@+id/recentAppsContainer"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recentAppsList"
+            android:id="@+id/appsList"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
+            android:layout_marginBottom="@dimen/share_all_apps_list_margin"
             android:clipToPadding="false"
             android:minHeight="@dimen/share_list_min_height"
             android:orientation="horizontal"
+            android:visibility="gone"
             app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/recentAppsContainer"
+            app:layout_constraintTop_toBottomOf="@id/apps_link_header"
             app:spanCount="2" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</HorizontalScrollView>
 
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/apps_link_header"
-        style="@style/ShareHeaderTextStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/share_all_apps_header_margin"
-        android:layout_marginTop="@dimen/share_all_apps_header_margin"
-        android:text="@string/share_link_all_apps_subheader"
-        app:layout_constraintStart_toEndOf="@+id/recentAppsContainer"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/appsList"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/share_all_apps_list_margin"
-        android:clipToPadding="false"
-        android:minHeight="@dimen/share_list_min_height"
-        android:orientation="horizontal"
-        android:visibility="gone"
-        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/recentAppsContainer"
-        app:layout_constraintTop_toBottomOf="@id/apps_link_header"
-        app:spanCount="2" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>