diff --git a/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkBackgroundService.java b/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkBackgroundService.java
index bfbbdbcac..ba362d5d7 100644
--- a/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkBackgroundService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkBackgroundService.java
@@ -44,6 +44,8 @@ public class MilkBackgroundService extends Service {
         if(context == null || context.getResources() == null)
             return;
 
+        ContextManager.setContext(context);
+
         if(MilkUtilities.isOngoing())
             return;
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkStartupReceiver.java b/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkStartupReceiver.java
index c66dac353..3bbcad6c3 100644
--- a/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkStartupReceiver.java
+++ b/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkStartupReceiver.java
@@ -7,11 +7,19 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
+import com.todoroo.andlib.service.ContextManager;
+import com.todoroo.astrid.service.AstridDependencyInjector;
+
 public class MilkStartupReceiver extends BroadcastReceiver {
 
+    static {
+        AstridDependencyInjector.initialize();
+    }
+
     @Override
     /** Called when device is restarted */
     public void onReceive(final Context context, Intent intent) {
+        ContextManager.setContext(context);
         MilkBackgroundService.scheduleService();
     }
 
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
index 11efeb63c..25474202f 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
@@ -91,7 +91,6 @@ public class FilterListActivity extends ExpandableListActivity {
         setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
 
         setTitle(R.string.FLA_title);
-        setUpList();
 
         onNewIntent(getIntent());
     }
@@ -117,6 +116,8 @@ public class FilterListActivity extends ExpandableListActivity {
             intent = new Intent(FilterListActivity.this, TaskListActivity.class);
             intent.putExtra(TaskListActivity.TOKEN_FILTER, filter);
             startActivity(intent);
+        } else {
+            setUpList();
         }
     }