diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt
index da942adba..8041abe08 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt
+++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt
@@ -263,8 +263,8 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
             hidden.isChecked = true
             hidden.isEnabled = false
         } else {
-            hidden.isChecked = preferences.getBoolean(R.string.p_show_hidden_tasks, false)
-            completed.isChecked = preferences.getBoolean(R.string.p_show_completed_tasks, false)
+            hidden.isChecked = preferences.showHidden
+            completed.isChecked = preferences.showCompleted
         }
         val sortMenu = menu.findItem(R.id.menu_sort)
         if (!filter.supportsSorting()) {
@@ -335,14 +335,14 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
             }
             R.id.menu_show_unstarted -> {
                 item.isChecked = !item.isChecked
-                preferences.setBoolean(R.string.p_show_hidden_tasks, item.isChecked)
+                preferences.showHidden = item.isChecked
                 loadTaskListContent()
                 localBroadcastManager.broadcastRefresh()
                 true
             }
             R.id.menu_show_completed -> {
                 item.isChecked = !item.isChecked
-                preferences.setBoolean(R.string.p_show_completed_tasks, item.isChecked)
+                preferences.showCompleted = item.isChecked
                 loadTaskListContent()
                 localBroadcastManager.broadcastRefresh()
                 true
diff --git a/app/src/main/java/org/tasks/preferences/Preferences.kt b/app/src/main/java/org/tasks/preferences/Preferences.kt
index fe6d1f07e..14821c478 100644
--- a/app/src/main/java/org/tasks/preferences/Preferences.kt
+++ b/app/src/main/java/org/tasks/preferences/Preferences.kt
@@ -309,7 +309,7 @@ class Preferences @JvmOverloads constructor(
         }
 
     override var showHidden: Boolean
-        get() = getBoolean(R.string.p_show_hidden_tasks, false)
+        get() = getBoolean(R.string.p_show_hidden_tasks, true)
         set(value) { setBoolean(R.string.p_show_hidden_tasks, value) }
 
     override var showCompleted: Boolean