diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesTagSelector.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesTagSelector.kt
index 52e5d666..b126c58d 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesTagSelector.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesTagSelector.kt
@@ -106,7 +106,13 @@ fun FavoritesTagSelector(
                                     ),
                                 tag = tag,
                                 selected = selectedTag == tag.tag,
-                                onClick = { onSelectTag(tag.tag) },
+                                onClick = {
+                                    if (selectedTag == tag.tag) {
+                                        onSelectTag(null)
+                                    } else {
+                                        onSelectTag(tag.tag)
+                                    }
+                                },
                             )
                         }
                         if (canScroll) {
@@ -180,7 +186,13 @@ fun FavoritesTagSelector(
                                     ),
                                 tag = tag,
                                 selected = selectedTag == tag.tag,
-                                onClick = { onSelectTag(tag.tag) },
+                                onClick = {
+                                    if (selectedTag == tag.tag) {
+                                        onSelectTag(null)
+                                    } else {
+                                        onSelectTag(tag.tag)
+                                    }
+                                },
                             )
                         }
                     }