diff --git a/catalog/java/io/material/catalog/preferences/CatalogPreferencesDialogFragment.java b/catalog/java/io/material/catalog/preferences/CatalogPreferencesDialogFragment.java
index cc79f3547..81d3958d3 100644
--- a/catalog/java/io/material/catalog/preferences/CatalogPreferencesDialogFragment.java
+++ b/catalog/java/io/material/catalog/preferences/CatalogPreferencesDialogFragment.java
@@ -68,11 +68,11 @@ public class CatalogPreferencesDialogFragment extends BottomSheetDialogFragment
       @NonNull LayoutInflater layoutInflater,
       @Nullable ViewGroup viewGroup,
       @Nullable Bundle bundle) {
-    LinearLayout container =
-        (LinearLayout) layoutInflater.inflate(
-            R.layout.mtrl_preferences_dialog, viewGroup, false);
+    View container = layoutInflater.inflate(R.layout.mtrl_preferences_dialog, viewGroup, false);
+    LinearLayout preferencesLayout = container.findViewById(R.id.preferences_layout);
     for (CatalogPreference catalogPreference : preferences.getPreferences()) {
-      container.addView(createPreferenceView(layoutInflater, container, catalogPreference));
+      preferencesLayout.addView(
+          createPreferenceView(layoutInflater, preferencesLayout, catalogPreference));
     }
     return container;
   }
diff --git a/catalog/java/io/material/catalog/preferences/res/layout/mtrl_preferences_dialog.xml b/catalog/java/io/material/catalog/preferences/res/layout/mtrl_preferences_dialog.xml
index 136a4b98e..555137d2b 100644
--- a/catalog/java/io/material/catalog/preferences/res/layout/mtrl_preferences_dialog.xml
+++ b/catalog/java/io/material/catalog/preferences/res/layout/mtrl_preferences_dialog.xml
@@ -13,20 +13,25 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:orientation="vertical"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
   android:paddingTop="16dp"
   android:paddingLeft="16dp"
-  android:paddingRight="16dp">
-
-  <TextView
+  android:paddingRight="16dp"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:overScrollMode="always">
+  <LinearLayout
+    android:id="@+id/preferences_layout"
+    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:paddingBottom="8dp"
-    android:text="@string/preferences_screen_title"
-    android:textAppearance="?attr/textAppearanceHeadline3"/>
+    android:layout_height="wrap_content">
+    <TextView
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:gravity="center"
+      android:paddingBottom="8dp"
+      android:text="@string/preferences_screen_title"
+      android:textAppearance="?attr/textAppearanceHeadline3"/>
+  </LinearLayout>
+</androidx.core.widget.NestedScrollView>
 
-</LinearLayout>