diff --git a/src/components/AssigneeFilter.vue b/src/components/AssigneeFilter.vue
index 2ee59a2..67758f0 100644
--- a/src/components/AssigneeFilter.vue
+++ b/src/components/AssigneeFilter.vue
@@ -63,6 +63,17 @@ async function loadMore({ done }: { done: (status: 'ok' | 'empty' | 'error') =>
   }
 }
 
+const hover = (userId: string) => {
+  if (hoveredId.value === userId) {
+    return { zIndex: 2 }
+  }
+  if (props.selected.includes(userId)) {
+    return { zIndex: 1 }
+  }
+
+  return { zIndex: 0 }
+}
+
 onMounted(() => {
   loadMore({ done: () => {} })
 })
@@ -71,7 +82,7 @@ onMounted(() => {
 <template>
   <div class="d-flex align-center">
     <v-avatar
-      v-for="(user, index) in avatarUsers"
+      v-for="user in avatarUsers"
       :key="user.id"
       rounded="circle"
       border
@@ -80,7 +91,7 @@ onMounted(() => {
       :text="initials(user)"
       class="stack-avatar cursor-pointer"
       :class="{ 'bg-primary': isSelected(user.id) }"
-      :style="{ zIndex: hoveredId === user.id ? avatarUsers.length + 1 : avatarUsers.length - index }"
+      :style="hover(user.id)"
       @mouseenter="hoveredId = user.id"
       @mouseleave="hoveredId = null"
       @click="toggle(user.id)"
@@ -92,7 +103,6 @@ onMounted(() => {
           rounded="circle"
           border
           density="compact"
-          variant="tonal"
           class="stack-avatar cursor-pointer"
           :style="{ zIndex: hoveredId === 'more' ? avatarUsers.length + 1 : 0 }"
           v-bind="activatorProps"
diff --git a/src/components/IssueContent.vue b/src/components/IssueContent.vue
index 11f9436..0156ae8 100644
--- a/src/components/IssueContent.vue
+++ b/src/components/IssueContent.vue
@@ -36,11 +36,11 @@ const cancel = () => {
     </template>
 
     <template v-else>
-      <v-textarea class="mb-1" hide-details v-model="draft" variant="outlined" auto-grow rows="4" />
+      <v-textarea autofocus class="mb-1" hide-details v-model="draft" variant="outlined" auto-grow rows="4" />
 
       <div class="d-flex justify-end ga-1">
         <v-btn density="compact" variant="text" text="Cancel" @click="cancel" />
-        <v-btn density="compact" color="primary" variant="tonal" text="Save" @click="save" />
+        <v-btn density="compact" color="primary" variant="flat" text="Save" @click="save" />
       </div>
     </template>
   </div>
diff --git a/src/components/IssueFilter.vue b/src/components/IssueFilter.vue
index c0c08bc..abb3f6c 100644
--- a/src/components/IssueFilter.vue
+++ b/src/components/IssueFilter.vue
@@ -1,29 +1,37 @@
 <script setup lang="ts">
+import { computed } from 'vue'
 import AssigneeFilter from '@/components/AssigneeFilter.vue'
 import TextFilter from '@/components/TextFilter.vue'
 
 interface Props {
   text?: string | null
+  assigneeId?: string | null
 }
 
-withDefaults(defineProps<Props>(), { text: null })
-const emit = defineEmits<{ 'update:text': [value: string | null] }>()
+const props = withDefaults(defineProps<Props>(), { text: null, assigneeId: null })
+const emit = defineEmits<{
+  'update:text': [value: string | null]
+  'update:assigneeId': [value: string | null]
+  'update:clear': []
+}>()
 
-function onChanged(value: string[]) {
-  console.log(value)
+const selectedAssignees = computed(() => (props.assigneeId ? [props.assigneeId] : []))
+
+function onAssigneeChanged(value: string[]) {
+  emit('update:assigneeId', value.at(-1) ?? null)
 }
 </script>
 
 <template>
-  <div class="u-grid2 ga-4 align-center">
+  <div class="filter-grid ga-4 align-center">
     <text-filter :model-value="text" @update:model-value="emit('update:text', $event)" />
-    <assignee-filter @changed="onChanged" :selected="['4Jpoz4EgViFrMpl7jQ969mVyX2IFYg5H']" />
-    <v-btn variant="text">clear filters</v-btn>
+    <assignee-filter :selected="selectedAssignees" @changed="onAssigneeChanged" />
+    <v-btn prepend-icon="mdi-close" variant="tonal" @click="emit('update:clear')">Clear Filters</v-btn>
   </div>
 </template>
 
 <style scoped lang="scss">
-.u-grid2 {
+.filter-grid {
   display: grid;
   grid-template-columns: 1fr auto auto;
 }
diff --git a/src/views/Issues/IssuesListView.vue b/src/views/Issues/IssuesListView.vue
index 49ce056..51c7f5c 100644
--- a/src/views/Issues/IssuesListView.vue
+++ b/src/views/Issues/IssuesListView.vue
@@ -26,6 +26,7 @@ const totalPages = ref(1)
 const serverItems = ref<Issue[]>([])
 
 const text = ref<string | null>(null)
+const assigneeId = ref<string | null>(null)
 const selected = ref<[string] | []>([])
 const batch = ref<number[]>([])
 const deleting = ref(false)
@@ -35,6 +36,7 @@ async function fetch() {
     page: page.value,
     limit: itemsPerPage.value,
     text: text.value,
+    assigneeId: assigneeId.value,
     projectId: currentProjectId.value,
   })
 
@@ -52,6 +54,7 @@ function syncQuery() {
   const query: Record<string, string> = { page: String(page.value) }
 
   if (text.value) query.text = text.value
+  if (assigneeId.value) query.assignee = assigneeId.value
   if (selected.value.length) query.selected_issue = selected.value[0]
 
   router.replace({ query })
@@ -62,6 +65,7 @@ watch(
   (query) => {
     page.value = query.page ? Number(query.page) : 1
     text.value = query.text ? String(query.text) : null
+    assigneeId.value = query.assignee ? String(query.assignee) : null
     selected.value = query.selected_issue ? [String(query.selected_issue)] : []
   },
   { immediate: true },
@@ -92,6 +96,20 @@ async function onTextChanged(value: string | null) {
   await load()
 }
 
+async function onAssigneeChanged(value: string | null) {
+  assigneeId.value = value
+  page.value = 1
+  await load()
+}
+
+async function onClear() {
+  text.value = null
+  assigneeId.value = null
+  page.value = 1
+
+  await load()
+}
+
 function close() {
   selected.value = []
 }
@@ -153,7 +171,14 @@ async function onDeleteBatch() {
   <div class="d-flex flex-column ga-2">
     <div class="u-grid ga-1">
       <div class="u-height">
-        <issue-filter class="mb-2" :text="text" @update:text="onTextChanged" />
+        <issue-filter
+          class="mb-2"
+          :text="text"
+          :assignee-id="assigneeId"
+          @update:text="onTextChanged"
+          @update:assignee-id="onAssigneeChanged"
+          @update:clear="onClear"
+        />
         <v-list class="pa-0" density="compact" v-model:selected="selected" mandatory>
           <v-list-item>
             <template #prepend>