diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index 98f32a00c..598796f48 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -777,7 +777,11 @@ public final class TaskListFragment extends InjectingFragment
 
   public void showDateTimePicker(TaskContainer task) {
     DateTimePicker.Companion.newDateTimePicker(
-            this, REQUEST_DUE_DATE, task.getId(), task.getDueDate(), false)
+            this,
+            REQUEST_DUE_DATE,
+            task.getId(),
+            task.getDueDate(),
+            preferences.getBoolean(R.string.p_auto_dismiss_datetime_list_screen, false))
         .show(getParentFragmentManager(), FRAG_TAG_DATE_TIME_PICKER);
   }
 
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index 1cb544978..02618295a 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -301,4 +301,5 @@
   <string name="p_collapse_tags">collapse_tags</string>
   <string name="p_collapse_locations">collapse_locations</string>
   <string name="p_auto_dismiss_datetime_edit_screen">auto_dismiss_datetime_edit_screen</string>
+  <string name="p_auto_dismiss_datetime_list_screen">auto_dismiss_datetime_list_screen</string>
 </resources>
diff --git a/app/src/main/res/xml/preferences_look_and_feel.xml b/app/src/main/res/xml/preferences_look_and_feel.xml
index 71487233f..c4e61045f 100644
--- a/app/src/main/res/xml/preferences_look_and_feel.xml
+++ b/app/src/main/res/xml/preferences_look_and_feel.xml
@@ -77,6 +77,12 @@
       android:key="@string/p_show_list_indicators"
       android:title="@string/show_list_indicators" />
 
+    <SwitchPreferenceCompat
+      android:defaultValue="false"
+      android:key="@string/p_auto_dismiss_datetime_list_screen"
+      android:title="@string/auto_dismiss_datetime"
+      android:summary="@string/auto_dismiss_datetime_summary" />
+
     <SwitchPreferenceCompat
       android:defaultValue="false"
       android:key="@string/p_linkify_task_list"