diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
index 07f3591b0..af6cf8ec5 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
@@ -1245,8 +1245,12 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
     }
 
     public void showSettings() {
+        Activity activity = getActivity();
+        if (activity == null)
+            return;
+
         StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_SETTINGS);
-        Intent intent = new Intent(getActivity(), EditPreferences.class);
+        Intent intent = new Intent(activity, EditPreferences.class);
         startActivityForResult(intent, ACTIVITY_SETTINGS);
     }