diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index 94d48ac69..8f7c72028 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -37,6 +37,7 @@ import butterknife.ButterKnife;
 import butterknife.OnClick;
 import com.google.android.material.snackbar.Snackbar;
 import com.todoroo.andlib.sql.Criterion;
+import com.todoroo.andlib.sql.Join;
 import com.todoroo.andlib.sql.QueryTemplate;
 import com.todoroo.astrid.adapter.GoogleTaskAdapter;
 import com.todoroo.astrid.adapter.TaskAdapter;
@@ -71,6 +72,7 @@ import org.tasks.activities.TagSettingsActivity;
 import org.tasks.analytics.Tracker;
 import org.tasks.analytics.Tracking;
 import org.tasks.caldav.CaldavCalendarSettingsActivity;
+import org.tasks.data.Tag;
 import org.tasks.dialogs.DialogBuilder;
 import org.tasks.dialogs.SortDialog;
 import org.tasks.injection.ForActivity;
@@ -350,11 +352,14 @@ public final class TaskListFragment extends InjectingFragment
     return new SearchFilter(
         title,
         new QueryTemplate()
+            .join(Join.left(Tag.TABLE, Tag.TASK_UID.eq(Task.UUID)))
             .where(
                 Criterion.and(
                     Task.DELETION_DATE.eq(0),
                     Criterion.or(
-                        Task.NOTES.like("%" + query + "%"), Task.TITLE.like("%" + query + "%")))));
+                        Task.NOTES.like("%" + query + "%"),
+                        Task.TITLE.like("%" + query + "%"),
+                        Tag.NAME.like("%" + query + "%")))));
   }
 
   @Override
diff --git a/app/src/main/java/org/tasks/data/Tag.java b/app/src/main/java/org/tasks/data/Tag.java
index 6433f897c..83deaa65e 100644
--- a/app/src/main/java/org/tasks/data/Tag.java
+++ b/app/src/main/java/org/tasks/data/Tag.java
@@ -5,6 +5,7 @@ import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.Ignore;
 import androidx.room.PrimaryKey;
+import com.todoroo.andlib.data.Property.StringProperty;
 import com.todoroo.andlib.data.Table;
 import org.tasks.backup.XmlReader;
 
@@ -15,6 +16,9 @@ public class Tag {
 
   @Deprecated public static final Table TABLE = new Table("tags");
 
+  public static final StringProperty TASK_UID = new StringProperty(TABLE, "task_uid");
+  public static final StringProperty NAME = new StringProperty(TABLE, "name");
+
   @PrimaryKey(autoGenerate = true)
   @ColumnInfo(name = "_id")
   private transient long id;