diff --git a/res/layout/notification_history_app_layout.xml b/res/layout/notification_history_app_layout.xml
index 24a43c66c71..52c0e421408 100644
--- a/res/layout/notification_history_app_layout.xml
+++ b/res/layout/notification_history_app_layout.xml
@@ -16,6 +16,7 @@
 
 <LinearLayout
     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"
     android:orientation="vertical">
@@ -78,14 +79,27 @@
         android:layout_height="1dp"
         android:background="?android:attr/listDivider"/>
 
-    <com.android.settings.notification.history.NotificationHistoryRecyclerView
-        android:id="@+id/notification_list"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/notification_list_wrapper"
         android:layout_width="match_parent"
-        android:layout_height="500dp"
-        android:clipChildren="true"
-        android:clipToPadding="true"
-        android:clipToOutline="true"
-        android:importantForAccessibility="yes"
-        android:scrollbars="none"/>
+        android:layout_height="wrap_content">
+
+        <com.android.settings.notification.history.NotificationHistoryRecyclerView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/notification_list"
+            android:clipChildren="true"
+            android:clipToPadding="true"
+            android:clipToOutline="true"
+            android:importantForAccessibility="yes"
+            app:layout_constrainedHeight="true"
+            app:layout_constraintHeight_min="48dp"
+            app:layout_constraintHeight_max="500dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/com/android/settings/notification/history/NotificationHistoryActivity.java b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
index 1d663fc1629..ec09a9fabba 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryActivity.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
@@ -163,7 +163,7 @@ public class NotificationHistoryActivity extends CollapsingToolbarBaseActivity {
             View viewForPackage = LayoutInflater.from(this)
                     .inflate(R.layout.notification_history_app_layout, null);
 
-            final View container = viewForPackage.findViewById(R.id.notification_list);
+            final View container = viewForPackage.findViewById(R.id.notification_list_wrapper);
             container.setVisibility(View.GONE);
             View header = viewForPackage.findViewById(R.id.app_header);
             NotificationExpandButton expand = viewForPackage.findViewById(