diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryUIView.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryUIView.kt
index 120481df08..d174236711 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryUIView.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryUIView.kt
@@ -6,7 +6,7 @@ package org.mozilla.fenix.library.history
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.core.widget.NestedScrollView
+import android.widget.LinearLayout
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.reactivex.Observable
 import io.reactivex.Observer
@@ -27,7 +27,7 @@ class HistoryUIView(
     var mode: HistoryState.Mode = HistoryState.Mode.Normal
         private set
 
-    override val view: NestedScrollView = LayoutInflater.from(container.context)
+    override val view: LinearLayout = LayoutInflater.from(container.context)
         .inflate(R.layout.component_history, container, true)
         .findViewById(R.id.history_wrapper)
 
diff --git a/app/src/main/res/layout/component_history.xml b/app/src/main/res/layout/component_history.xml
index aefb1be8c2..7c5382621c 100644
--- a/app/src/main/res/layout/component_history.xml
+++ b/app/src/main/res/layout/component_history.xml
@@ -3,42 +3,38 @@
    - 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.core.widget.NestedScrollView
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/history_wrapper"
-    android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <FrameLayout
+        android:id="@+id/delete_history_button"
+        android:foreground="?android:attr/selectableItemBackground"
+        android:background="@drawable/button_background"
+        android:layout_margin="16dp"
+        android:padding="6dp"
+        android:clickable="true"
+        android:focusable="true"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-        <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/delete_history_button"
-            android:foreground="?android:attr/selectableItemBackground"
-            android:background="@drawable/button_background"
-            android:layout_margin="16dp"
-            android:padding="6dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+        android:layout_height="wrap_content">
 
-            <TextView
-                android:id="@+id/delete_history_button_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/history_delete_all"
-                android:textColor="?attr/deleteColor"
-                android:drawablePadding="8dp"
-                android:textSize="16sp"
-                android:gravity="center"
-                android:clickable="false"
-                android:focusable="false"
-                android:layout_gravity="center" />
-        </FrameLayout>
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/history_list"
+        <TextView
+            android:id="@+id/delete_history_button_text"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-    </LinearLayout>
-</androidx.core.widget.NestedScrollView>
+            android:layout_height="wrap_content"
+            android:text="@string/history_delete_all"
+            android:textColor="?attr/deleteColor"
+            android:drawablePadding="8dp"
+            android:textSize="16sp"
+            android:gravity="center"
+            android:clickable="false"
+            android:focusable="false"
+            android:layout_gravity="center" />
+    </FrameLayout>
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/history_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>