diff --git a/ShoppingList/src/main/java/org/openintents/shopping/ui/PreferenceActivity.java b/ShoppingList/src/main/java/org/openintents/shopping/ui/PreferenceActivity.java
index dcacace..3e42e2c 100644
--- a/ShoppingList/src/main/java/org/openintents/shopping/ui/PreferenceActivity.java
+++ b/ShoppingList/src/main/java/org/openintents/shopping/ui/PreferenceActivity.java
@@ -90,7 +90,7 @@ public class PreferenceActivity extends android.preference.PreferenceActivity
     public static final String PREFS_USE_FILTERS = "use_filters";
     public static final boolean PREFS_USE_FILTERS_DEFAULT = false;
     public static final String PREFS_CURRENT_LIST_COMPLETE = "autocomplete_only_this_list";
-    public static final boolean PREFS_CURRENT_LIST_COMPLETE_DEFAULT = false;
+    public static final boolean PREFS_CURRENT_LIST_COMPLETE_DEFAULT = true;
     public static final String PREFS_SORT_PER_LIST = "perListSort";
     public static final boolean PREFS_SORT_PER_LIST_DEFAULT = false;
     public static final String PREFS_HOLO_SEARCH = "holosearch";
diff --git a/ShoppingList/src/main/res/xml/preferences.xml b/ShoppingList/src/main/res/xml/preferences.xml
index e75f665..925d943 100644
--- a/ShoppingList/src/main/res/xml/preferences.xml
+++ b/ShoppingList/src/main/res/xml/preferences.xml
@@ -113,7 +113,7 @@
                     android:summary="@string/preference_reset_quantity_summary"
                     android:title="@string/preference_reset_quantity" />
                 <CheckBoxPreference
-                    android:defaultValue="false"
+                    android:defaultValue="true"
                     android:key="autocomplete_only_this_list"
                     android:summaryOff="@string/preference_complete_by_list_off_summary"
                     android:summaryOn="@string/preference_complete_by_list_on_summary"