diff --git a/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java b/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java
index 1c61f1a62..45c6c7def 100644
--- a/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java
+++ b/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java
@@ -138,4 +138,8 @@ public class TagViewFragment extends TaskListFragment {
     public void inject(FragmentComponent component) {
         component.inject(this);
     }
+
+    public TagData getTagData() {
+        return tagData;
+    }
 }
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index b0010d123..c7edab030 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -597,7 +597,8 @@ public class TaskListFragment extends InjectingListFragment implements
                 Task.ID.eq(Field.field(TAGS_METADATA_JOIN + "." + Metadata.TASK.name)));
 
         if (this instanceof TagViewFragment) {
-            tagsJoinCriterion = Criterion.and(tagsJoinCriterion, Field.field(TAGS_METADATA_JOIN + "." + TaskToTagMetadata.TAG_NAME.name).neq(filter.listingTitle));
+            String uuid = ((TagViewFragment) this).getTagData().getUuid();
+            tagsJoinCriterion = Criterion.and(tagsJoinCriterion, Field.field(TAGS_METADATA_JOIN + "." + TaskToTagMetadata.TAG_UUID.name).neq(uuid));
         }
 
         // TODO: For now, we'll modify the query to join and include the things like tag data here.