diff --git a/res/xml/modes_set_calendar.xml b/res/xml/modes_set_calendar.xml
index be094f21f39..f6785a7fac9 100644
--- a/res/xml/modes_set_calendar.xml
+++ b/res/xml/modes_set_calendar.xml
@@ -26,13 +26,13 @@
         android:key="zen_mode_event_category">
 
         <!-- During events for -->
-        <DropDownPreference
+        <ListPreference
             android:key="calendar"
             android:title="@string/zen_mode_set_calendar_which_calendar"
             android:summary="%s" />
 
         <!-- Where reply is -->
-        <DropDownPreference
+        <ListPreference
             android:key="reply"
             android:title="@string/zen_mode_set_calendar_which_reply"
             android:summary="%s" />
diff --git a/src/com/android/settings/notification/modes/ZenModeSetCalendarPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeSetCalendarPreferenceController.java
index 67882360401..728ab988b65 100644
--- a/src/com/android/settings/notification/modes/ZenModeSetCalendarPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeSetCalendarPreferenceController.java
@@ -25,7 +25,7 @@ import android.provider.CalendarContract;
 import android.service.notification.ZenModeConfig;
 
 import androidx.annotation.NonNull;
-import androidx.preference.DropDownPreference;
+import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 
@@ -49,8 +49,8 @@ class ZenModeSetCalendarPreferenceController extends AbstractZenModePreferenceCo
     @VisibleForTesting
     protected static final String KEY_REPLY = "reply";
 
-    private DropDownPreference mCalendar;
-    private DropDownPreference mReply;
+    private ListPreference mCalendar;
+    private ListPreference mReply;
 
     private ZenModeConfig.EventInfo mEvent;