diff --git a/src/components/tags/TagSelector.tsx b/src/components/tags/TagSelector.tsx
index c45a8ca..d46e00c 100644
--- a/src/components/tags/TagSelector.tsx
+++ b/src/components/tags/TagSelector.tsx
@@ -298,9 +298,13 @@ export default function TagSelector({ itemKey, onTagsChanged, refreshKey }: Prop
         {all.categories.map((category) => {
           const categoryTags = all.tags.filter((t) => t.categoryId === category.id)
           const search = categorySearches[category.id] ?? ''
-          const visibleTags = categoryTags
-            .filter((t) => !search || t.name.toLowerCase().includes(search.toLowerCase()))
-            .slice(0, 25)
+          const filtered = categoryTags.filter(
+            (t) => !search || t.name.toLowerCase().includes(search.toLowerCase())
+          )
+          const visibleTags = [
+            ...filtered.filter((t) => isAssigned(t.id)),
+            ...filtered.filter((t) => !isAssigned(t.id)),
+          ].slice(0, 25)
 
           return (
             <div key={category.id}>