diff --git a/app/src/main/java/com/todoroo/astrid/core/SortHelper.java b/app/src/main/java/com/todoroo/astrid/core/SortHelper.java
index 9c73205b6..5afe3c72f 100644
--- a/app/src/main/java/com/todoroo/astrid/core/SortHelper.java
+++ b/app/src/main/java/com/todoroo/astrid/core/SortHelper.java
@@ -59,14 +59,14 @@ public class SortHelper {
     if (preferences.getBoolean(R.string.p_show_completed_tasks, false)) {
       adjustedSql =
           adjustedSql.replace(Task.COMPLETION_DATE.eq(0).toString(), Criterion.all.toString());
-    } else {
+    } else if (preferences.getBoolean(R.string.p_temporarily_show_completed_tasks, false)) {
       adjustedSql =
-              adjustedSql.replace(
-                      Task.COMPLETION_DATE.eq(0).toString(),
-                      Criterion.or(
-                              Task.COMPLETION_DATE.lte(0),
-                              Task.COMPLETION_DATE.gt(DateUtilities.now() - 60000))
-                              .toString());
+          adjustedSql.replace(
+              Task.COMPLETION_DATE.eq(0).toString(),
+              Criterion.or(
+                      Task.COMPLETION_DATE.lte(0),
+                      Task.COMPLETION_DATE.gt(DateUtilities.now() - 60000))
+                  .toString());
     }
     if (preferences.getBoolean(R.string.p_show_hidden_tasks, false)) {
       adjustedSql = adjustedSql.replace(isVisible().toString(), Criterion.all.toString());
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index 81dcc6027..ee8ad92a7 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -188,6 +188,7 @@
   <string name="TEA_ctrl_google_task_list">TEA_ctrl_gtask</string>
   <string name="p_show_hidden_tasks">show_hidden_tasks</string>
   <string name="p_show_completed_tasks">show_completed_tasks</string>
+  <string name="p_temporarily_show_completed_tasks">temporarily_show_completed_tasks</string>
   <string name="p_reverse_sort">reverse_sort</string>
   <string name="p_manual_sort">manual_sort</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 86a243a19..c5370f061 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -94,6 +94,9 @@ File %1$s contained %2$s.\n\n
   <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
   <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
   <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
+  <string name="EPr_temp_show_completed_tasks">Temporarily show tasks upon completion</string>
+  <string name="EPr_temp_completed_tasks_showing">Tasks will remain temporarily visible in the list after completion</string>
+  <string name="EPr_temp_completed_tasks_not_showing">Tasks will immediately disappear from the list after completion</string>
   <string name="EPr_manage_header">Manage old tasks</string>
   <string name="EPr_manage_purge_deleted">Purge deleted tasks</string>
   <string name="EPr_manage_purge_deleted_message">Do you really want to purge all your deleted tasks?\n\nThese tasks will be gone forever!</string>
diff --git a/app/src/main/res/xml/preferences_misc.xml b/app/src/main/res/xml/preferences_misc.xml
index 22a40b728..4faf4e129 100644
--- a/app/src/main/res/xml/preferences_misc.xml
+++ b/app/src/main/res/xml/preferences_misc.xml
@@ -25,4 +25,11 @@
     android:summaryOn="@string/EPr_cal_start_at_due_time"
     android:title="@string/EPr_cal_end_or_start_at_due_time"/>
 
+  <CheckBoxPreference
+      android:defaultValue="false"
+      android:key="@string/p_temporarily_show_completed_tasks"
+      android:summaryOff="@string/EPr_temp_completed_tasks_not_showing"
+      android:summaryOn="@string/EPr_temp_completed_tasks_showing"
+      android:title="@string/EPr_temp_show_completed_tasks"/>
+
 </PreferenceScreen>