diff --git a/astrid/res/values/strings-tags.xml b/astrid/res/values/strings-tags.xml
index 801cd1246..e1ecb0684 100644
--- a/astrid/res/values/strings-tags.xml
+++ b/astrid/res/values/strings-tags.xml
@@ -72,10 +72,10 @@
   <!-- context menu option to leave a shared list -->
   <string name="tag_cm_leave">Leave List</string>
 
-  <!-- Dialog to confirm deletion of a tag -->
+  <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
   <string name="DLG_delete_this_tag_question">Delete this list: %s? (No tasks will be deleted.)</string>
   
-  <!-- Dialog to confirm leaving a shared tag -->
+  <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
   <string name="DLG_leave_this_shared_tag_question">Leave this shared list: %s? (No tasks will be deleted.)</string>
 
   <!-- Dialog to rename tag -->
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 16e06b0e4..ee6bee60a 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -391,8 +391,8 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
             String deletedTag = intent.getStringExtra(TagViewFragment.EXTRA_TAG_NAME);
             FilterListFragment fl = getFilterListFragment();
             if (fl != null) {
-                String currentlyShowing = getIntent().getStringExtra(TagViewFragment.EXTRA_TAG_NAME);
-                if (currentlyShowing != null && currentlyShowing.equals(deletedTag)) {
+                Filter currentlyShowing = getIntent().getParcelableExtra(TaskListFragment.TOKEN_FILTER);
+                if (currentlyShowing != null && currentlyShowing.title != null && currentlyShowing.title.equals(deletedTag)) {
                     fl.switchToActiveTasks();
                 }
                 fl.clear(); // Should auto refresh