diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
index a3d9cc01d..032cbfb12 100644
--- a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
+++ b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
@@ -10,7 +10,6 @@ import com.todoroo.astrid.api.GtasksFilter;
 
 import org.tasks.gtasks.SyncAdapterHelper;
 
-import java.util.Collections;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -42,10 +41,9 @@ public class GtasksFilterExposer {
         }
 
         List<Filter> listFilters = newArrayList();
-        for (GtasksList list : gtasksListService.getLists()) {
+        for (GtasksList list : gtasksListService.getSortedGtasksList()) {
             listFilters.add(filterFromList(list));
         }
-        Collections.sort(listFilters, (filter, t1) -> filter.listingTitle.compareTo(t1.listingTitle));
         return listFilters;
     }
 
diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListService.java b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListService.java
index caab62c0e..c322143d4 100644
--- a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListService.java
+++ b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListService.java
@@ -8,6 +8,7 @@ package com.todoroo.astrid.gtasks;
 import com.google.api.services.tasks.model.TaskList;
 import com.todoroo.astrid.dao.StoreObjectDao;
 
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -32,6 +33,12 @@ public class GtasksListService {
         return storeObjectDao.getGtasksLists();
     }
 
+    public List<GtasksList> getSortedGtasksList() {
+        List<GtasksList> lists = getLists();
+        Collections.sort(lists, (left, right) -> left.getName().compareTo(right.getName()));
+        return lists;
+    }
+
     public GtasksList getList(long id) {
         return storeObjectDao.getGtasksList(id);
     }
diff --git a/src/googleplay/java/org/tasks/activities/SupportGoogleTaskListPicker.java b/src/googleplay/java/org/tasks/activities/SupportGoogleTaskListPicker.java
index 8dd45e77b..20e51ad8d 100644
--- a/src/googleplay/java/org/tasks/activities/SupportGoogleTaskListPicker.java
+++ b/src/googleplay/java/org/tasks/activities/SupportGoogleTaskListPicker.java
@@ -39,7 +39,7 @@ public class SupportGoogleTaskListPicker extends InjectingDialogFragment {
     }
 
     public static AlertDialog createDialog(DialogBuilder dialogBuilder, GtasksListService gtasksListService, final GoogleTaskListSelectionHandler handler) {
-        final List<GtasksList> lists = gtasksListService.getLists();
+        final List<GtasksList> lists = gtasksListService.getSortedGtasksList();
         List<String> listNames = transform(lists, GtasksList::getName);
         return dialogBuilder.newDialog()
                 .setItems(listNames, (dialog, which) -> {
diff --git a/src/main/java/org/tasks/filters/FilterCriteriaProvider.java b/src/main/java/org/tasks/filters/FilterCriteriaProvider.java
index 28c5070de..c3e13ca26 100644
--- a/src/main/java/org/tasks/filters/FilterCriteriaProvider.java
+++ b/src/main/java/org/tasks/filters/FilterCriteriaProvider.java
@@ -179,7 +179,7 @@ public class FilterCriteriaProvider {
     }
 
     private CustomFilterCriterion getGtasksFilterCriteria() {
-        List<GtasksList> lists = gtasksListService.getLists();
+        List<GtasksList> lists = gtasksListService.getSortedGtasksList();
 
         String[] listNames = new String[lists.size()];
         String[] listIds = new String[lists.size()];