diff --git a/front/src/components/channels/UploadForm.vue b/front/src/components/channels/UploadForm.vue
index 4ca527010..e95056aba 100644
--- a/front/src/components/channels/UploadForm.vue
+++ b/front/src/components/channels/UploadForm.vue
@@ -33,7 +33,7 @@ interface Events {
 
 interface Props {
   channel: Channel | null,
-  filter: 'podcast' | 'music'
+  filter: 'podcast' | 'music' | undefined,
 }
 
 interface QuotaStatus {
diff --git a/front/src/components/ui/Pill.vue b/front/src/components/ui/Pill.vue
index ba0ef3f94..c1a0c090d 100644
--- a/front/src/components/ui/Pill.vue
+++ b/front/src/components/ui/Pill.vue
@@ -2,22 +2,31 @@
 import { ref, onMounted } from 'vue'
 import { type ColorProps, type PastelProps, type VariantProps, type RaisedProps, color } from '~/composables/color'
 
-const input = ref()
+
+const input = ref<HTMLInputElement>();
 const emit = defineEmits<{
   click: [event: MouseEvent]
 }>()
 const handleClick = (event: MouseEvent) => {
   emit('click', event)
   if (model.value !== undefined) {
-    (input.value as HTMLInputElement).focus()
+    input.value?.focus();
   }
 }
 const props = defineProps<{ noUnderline?:true, autofocus? : boolean } &(PastelProps | ColorProps) & VariantProps & RaisedProps>()
 const model = defineModel<string>()
 
 onMounted(() => {
-  if (props.autofocus) input.value.focus()
+  if (props.autofocus) input.value?.focus();
 })
+
+const sanitize = () =>
+  model.value = model.value?.replace(',', '')?.trim()
+
+const sanitizeAndBlur = () =>
+  sanitize() && input.value?.blur()
+
+
 </script>
 
 <template>
@@ -40,8 +49,10 @@ onMounted(() => {
       ref="input"
       contenteditable
       class="pill-content"
-      @keydown.enter="(e) => (e.target as HTMLInputElement).blur()"
-      @blur="(e) => model = (e.target as HTMLInputElement).innerText.trim()"
+      @keydown.enter.prevent="sanitizeAndBlur"
+      @keyup.space.prevent="sanitizeAndBlur"
+      @keyup.,.prevent="sanitizeAndBlur"
+      @blur="sanitize"
     >
       {{ model }}
     </span>
diff --git a/front/src/composables/onKeyboardShortcut.ts b/front/src/composables/onKeyboardShortcut.ts
index b54d428d3..7b56c9159 100644
--- a/front/src/composables/onKeyboardShortcut.ts
+++ b/front/src/composables/onKeyboardShortcut.ts
@@ -20,7 +20,7 @@ useEventListener(window, 'keydown', (event) => {
   if (!event.key) return
 
   const target = event.target as HTMLElement
-  if (target.tagName === 'INPUT' || target.tagName === 'TEXTAREA') return
+  if (target.tagName === 'INPUT' || target.tagName === 'TEXTAREA' || target.isContentEditable) return
 
   current.add(event.key.toLowerCase())
 
diff --git a/front/src/ui/modals/Upload.vue b/front/src/ui/modals/Upload.vue
index ef046d69b..458ddda9c 100644
--- a/front/src/ui/modals/Upload.vue
+++ b/front/src/ui/modals/Upload.vue
@@ -22,9 +22,9 @@ import LibraryWidget from '~/components/federation/LibraryWidget.vue'
 const { t } = useI18n()
 const store = useStore()
 
-onKeyboardShortcut('u', () => useModal('upload').toggle())
+const { isOpen, toggle } = useModal('upload')
 
-const isOpen = useModal('upload').isOpen
+onKeyboardShortcut('u', toggle)
 
 type UploadDestination =
   | { type: 'channel', channel?: Channel | null, filter?: 'podcast' | 'music' }
@@ -76,85 +76,74 @@ const channelUpload = ref()
 <template>
   <Modal
     v-model="isOpen"
+    :cancel="t('components.channels.UploadModal.button.cancel')"
     :title="modalTitle"
   >
-    <!-- Page content -->
-    <!-- Page 1 -->
 
-    <Layout
-      v-if="state.page === 'selectDestination'"
-      flex
-      style="place-content:center"
+  <!-- Page content -->
+  <!-- Page 1 -->
+
+  <Layout flex style="place-content:center" v-if="state.page === 'selectDestination'">
+    <Card
+      small
+      solid
+      title="Music"
+      icon="bi-upload"
+      @click="destinationSelected({ type: 'library' })"
     >
-      <Card
-        small
-        solid
-        title="Music"
-        icon="bi-upload"
-        @click="destinationSelected('library')"
-      >
-        <template #image>
-          <i
-            class="bi bi-headphones solid secondary raised"
-            :class="$style.icon"
-          />
-        </template>
-        {{ "Host music you listen to" /* TODO: Translate */ }}
-      </Card>
-      <Card
-        small
-        title="Music"
-        solid
-        icon="bi-upload primary solid"
-        @click="destinationSelected('channel')"
-      >
-        <template #image>
-          <i
-            class="bi bi-music-note-beamed solid primary"
-            :class="$style.icon"
-          />
-        </template>
-        {{ "Publish music you make" /* TODO: Translate */ }}
-      </Card>
-      <Card
-        small
-        solid
-        title="Podcast"
-        icon="bi-upload primary solid"
-        @click="destinationSelected('podcast')"
-      >
-        <template #image>
-          <i
-            class="bi bi-mic-fill solid primary"
-            :class="$style.icon"
-          />
-        </template>
-        {{ "Publish podcasts you make" /* TODO: Translate */ }}
-      </Card>
-    </Layout>
-
-    <!-- Page 2 -->
-
-    <Layout
-      v-if="state.page === 'uploadFiles'"
-      stack
+      <template #image>
+        <i class="bi bi-headphones solid secondary raised" :class="$style.icon"></i>
+      </template>
+      {{ "Host music you listen to" /* TODO: Translate */ }}
+    </Card>
+    <Card
+      small
+      title="Music"
+      solid
+      icon="bi-upload primary solid"
+      @click="destinationSelected({ type: 'channel', filter: 'music' })"
     >
-      <!--  -->
+      <template #image>
+        <i class="bi bi-music-note-beamed solid primary" :class="$style.icon"></i>
+      </template>
+      {{ "Publish music you make" /* TODO: Translate */ }}
+    </Card>
+    <Card
+      small
+      solid
+      title="Podcast"
+      icon="bi-upload primary solid"
+      @click="destinationSelected({ type: 'channel', filter: 'podcast' })"
+    >
+      <template #image>
+        <i class="bi bi-mic-fill solid primary" :class="$style.icon"></i>
+      </template>
+      {{ "Publish podcasts you make" /* TODO: Translate */ }}
+    </Card>
+  </Layout>
 
-      <ChannelUpload
-        v-if="state.uploadDestination === 'channel'"
-        ref="channelUpload"
+  <!-- Page 2 -->
+
+  <Layout stack v-if="state.page === 'uploadFiles'">
+
+    <!--  -->
+
+    <ChannelUpload
+      ref="channelUpload"
+      v-if="state.uploadDestination?.type === 'channel'"
+      :filter="state.uploadDestination.filter"
+      :channel="null"
       />
 
       <!--  -->
 
-      <!-- Privacy Slider -->
-      <LibraryUpload
-        v-if="state.uploadDestination === 'library'"
-        v-model="privacyLevel"
-      />
-      {{ state.files }}
-    </Layout>
+    <!-- Privacy Slider -->
+    <LibraryUpload
+      v-if="state.uploadDestination?.type === 'library'"
+      v-model="privacyLevel">
+    </LibraryUpload>
+    {{ state.files }}
+  </Layout>
 
     <template #actions>
       <Button
@@ -164,16 +153,7 @@ const channelUpload = ref()
       >
         {{ t('components.channels.UploadModal.button.previous') }}
       </Button>
-      <Spacer
-        h
-        grow
-      />
-      <Button
-        secondary
-        :on-click="() => { isOpen = false }"
-      >
-        {{ t('components.channels.UploadModal.button.cancel') }}
-      </Button>
+      <Spacer h grow />
       <Spacer size-16 />
       <Button
         v-if="state.page === 'uploadFiles'"