diff --git a/packages/ui/src/components/TimeShiftPicker.svelte b/packages/ui/src/components/TimeShiftPicker.svelte
index 75ab0c4e0f..fada3cf4ba 100644
--- a/packages/ui/src/components/TimeShiftPicker.svelte
+++ b/packages/ui/src/components/TimeShiftPicker.svelte
@@ -54,11 +54,9 @@
     if (!opened) {
       opened = true
       showPopup(TimeShiftPopup, { title, value, direction }, container, (ev) => {
-        console.log('picker close handle')
-        console.log(ev)
         changeValue(ev)
         opened = false
-      }, changeValue)
+      })
     }
   }}
 >
diff --git a/packages/ui/src/components/TimeShiftPopup.svelte b/packages/ui/src/components/TimeShiftPopup.svelte
index 995b4d5ce8..be1576cea7 100644
--- a/packages/ui/src/components/TimeShiftPopup.svelte
+++ b/packages/ui/src/components/TimeShiftPopup.svelte
@@ -33,8 +33,8 @@
 
 <div class="antiPopup">
   {#each values as value}
-    <div class="ap-menuItem">
-      <TimeShiftPresenter value={value * base} on:click={() => { dispatch('close', value) }} />
+    <div class="ap-menuItem" on:click={() => { dispatch('close', value) }} >
+      <TimeShiftPresenter value={value * base}/>
     </div>
   {/each}
 </div>
\ No newline at end of file
diff --git a/packages/ui/src/components/TimeShiftPresenter.svelte b/packages/ui/src/components/TimeShiftPresenter.svelte
index 205bd5af20..604d385fce 100644
--- a/packages/ui/src/components/TimeShiftPresenter.svelte
+++ b/packages/ui/src/components/TimeShiftPresenter.svelte
@@ -26,8 +26,6 @@
   let time: string = ''
 
   async function formatTime (value: number) {
-    console.log('value')
-    console.log(value)
     if (value > 0) {
       if (value < HOUR) {
         time = await translate(ui.string.MinutesAfter, { minutes: Math.floor(value / MINUTE) })
@@ -52,4 +50,4 @@
 
 </script>
 
-<span style="white-space: nowrap;" on:click>{time}</span>
\ No newline at end of file
+<span style="white-space: nowrap;">{time}</span>
\ No newline at end of file
diff --git a/plugins/calendar-resources/src/components/CreateReminder.svelte b/plugins/calendar-resources/src/components/CreateReminder.svelte
index ad1b70f428..95afff4156 100644
--- a/plugins/calendar-resources/src/components/CreateReminder.svelte
+++ b/plugins/calendar-resources/src/components/CreateReminder.svelte
@@ -33,7 +33,7 @@
   const client = getClient()
 
   export function canClose (): boolean {
-    return title.trim().length === 0 && participants.length === 0
+    return title !== undefined && title.trim().length === 0 && participants.length === 0
   }
 
   async function saveReminder () {
@@ -58,7 +58,7 @@
 <Card
   label={calendar.string.CreateReminder}
   okAction={saveReminder}
-  canSave={title.trim().length > 0 && participants.length > 0}
+  canSave={title !== undefined && title.trim().length > 0 && participants.length > 0}
   {space}
   on:close={() => {
     dispatch('close')
diff --git a/plugins/calendar-resources/src/components/DocReminder.svelte b/plugins/calendar-resources/src/components/DocReminder.svelte
index 2a4a880cae..a9d275e979 100644
--- a/plugins/calendar-resources/src/components/DocReminder.svelte
+++ b/plugins/calendar-resources/src/components/DocReminder.svelte
@@ -39,7 +39,7 @@
       if (current === undefined) {
         showPopup(CreateReminder, { attachedTo: value._id, attachedToClass: value._class, title }, ev.target as HTMLElement)
       } else {
-        showPopup(DocRemindersPopup, { attachedTo: value._id, attachedToClass: value._class }, ev.target as HTMLElement )
+        showPopup(DocRemindersPopup, { attachedTo: value._id, attachedToClass: value._class, title }, ev.target as HTMLElement )
       }
     }
   }