diff --git a/src/components/tasks/partials/reminder-detail.vue b/src/components/tasks/partials/reminder-detail.vue
index 50776f42..778416fa 100644
--- a/src/components/tasks/partials/reminder-detail.vue
+++ b/src/components/tasks/partials/reminder-detail.vue
@@ -1,22 +1,29 @@
 <template>
 	<div>
-		<ReminderPeriod v-if="showRelativeReminder" v-model="reminder" :disabled="disabled"
-										@update:modelValue="() => updateData()"></ReminderPeriod>
+		<ReminderPeriod
+			v-if="showRelativeReminder"
+			v-model="reminder"
+			:disabled="disabled"
+			@update:modelValue="emit('update:modelValue', reminder.value)"
+		/>
+
 		<Datepicker
-				v-if="showAbsoluteReminder"
-				v-model="reminderDate"
-				:disabled="disabled"
-				@close-on-change="() => setReminderDate()"
+			v-if="showAbsoluteReminder"
+			v-model="reminderDate"
+			:disabled="disabled"
+			@close-on-change="setReminderDate"
 		/>
 	</div>
 </template>
 
 <script setup lang="ts">
+import {computed, ref, watch, type PropType} from 'vue'
+
+import type {ITaskReminder} from '@/modelTypes/ITaskReminder'
+
 import Datepicker from '@/components/input/datepicker.vue'
 import ReminderPeriod from '@/components/tasks/partials/reminder-period.vue'
 import TaskReminderModel from '@/models/taskReminder'
-import type {ITaskReminder} from '@/modelTypes/ITaskReminder'
-import {computed, ref, watch, type PropType} from 'vue'
 
 const props = defineProps({
 	modelValue: {
@@ -30,35 +37,35 @@ const props = defineProps({
 
 const emit = defineEmits(['update:modelValue'])
 
-const reminder = ref<ITaskReminder>()
-const reminderDate = ref()
+const reminder = ref<ITaskReminder>(new TaskReminderModel())
+const reminderDate = computed({
+	get() {
+		return reminder.value?.reminder
+	},
+	set(newReminderDate) {
+		if (!reminderDate.value) {
+			return
+		}
+		reminder.value.reminder = new Date(reminderDate.value)
+	}
+})
 
 const showAbsoluteReminder = computed(() => !reminder.value || !reminder.value?.relativeTo)
 const showRelativeReminder = computed(() => !reminder.value || reminder.value?.relativeTo)
 
 watch(
-		() => props.modelValue,
-		(value) => {
-			reminder.value = value
-			if (reminder.value && reminder.value.reminder) {
-				reminderDate.value = new Date(reminder.value.reminder)
-			}
+		props.modelValue,
+		(newReminder) => {
+			reminder.value = newReminder || new TaskReminderModel()
 		},
 		{immediate: true},
 )
 
-function updateData() {
-	emit('update:modelValue', reminder.value)
-}
-
 function setReminderDate() {
 	if (!reminderDate.value) {
 		return
 	}
-	if (!reminder.value) {
-		reminder.value = new TaskReminderModel()
-	}
 	reminder.value.reminder = new Date(reminderDate.value)
-	updateData()
+	emit('update:modelValue', reminder.value)
 }
 </script>
diff --git a/src/components/tasks/partials/reminder-period.vue b/src/components/tasks/partials/reminder-period.vue
index 391f9b92..365183c7 100644
--- a/src/components/tasks/partials/reminder-period.vue
+++ b/src/components/tasks/partials/reminder-period.vue
@@ -1,78 +1,96 @@
 <template>
-	<div class="datepicker">
-		<BaseButton :disabled="disabled" class="show" v-if="!!reminder?.relativeTo" @click.stop="togglePeriodPopup">
-			{{ formatDuration(reminder.relativePeriod) }} {{ reminder.relativePeriod <= 0 ? '&le;' : '&gt;' }}
-			{{ formatRelativeTo(reminder.relativeTo) }}
-		</BaseButton>
-		<CustomTransition name="fade">
-			<div v-if="isShowForm" class="mt-2" ref="periodPopup">
-				<div class="control is-flex is-align-items-center">
-					<input
-							:disabled="disabled"
-							class="input"
-							:placeholder="$t('task.reminder.daysShort')"
-							v-model="periodInput.duration.days"
-							type="number"
-							min="0"
-					/> {{ $t('task.reminder.days') }}
-					<input
+	<div
+		v-if="!!reminder?.relativeTo"	
+		class="reminder-period"
+	>
+		<Popup>
+			<template #trigger="{toggle}">
+				<BaseButton
+					@click="toggle"
+					:disabled="disabled"
+					class="show"
+				>
+					{{ formatDuration(reminder.relativePeriod) }} {{ reminder.relativePeriod <= 0 ? '&le;' : '&gt;' }}
+					{{ formatRelativeTo(reminder.relativeTo) }}
+					<span class="icon"><icon icon="chevron-down"/></span>
+				</BaseButton>
+			</template>
+
+			<template #content>
+				<div class="mt-2">
+					<div class="control is-flex is-align-items-center">
+						<label>
+							<input
+								:disabled="disabled"
+								class="input"
+								:placeholder="$t('task.reminder.daysShort')"
+								v-model="periodInput.duration.days"
+								type="number"
+								min="0"
+							/> {{ $t('task.reminder.days') }}
+						</label>
+						<input
 							:disabled="disabled"
 							class="input"
 							:placeholder="$t('task.reminder.hoursShort')"
 							v-model="periodInput.duration.hours"
 							type="number"
 							min="0"
-					/>:
-					<input
+						/>:
+						<input
 							:disabled="disabled"
 							class="input"
 							:placeholder="$t('task.reminder.minutesShort')"
 							v-model="periodInput.duration.minutes"
 							type="number"
 							min="0"
-					/>
-					<div class="select">
-						<select :disabled="disabled" v-model="periodInput.sign" id="sign">
-							<option value="-1">&le;</option>
-							<option value="1">&gt;</option>
-						</select>
+						/>
+
+						<div class="select">
+							<select :disabled="disabled" v-model.number="periodInput.sign">
+								<option value="-1">&le;</option>
+								<option value="1">&gt;</option>
+							</select>
+						</div>
+
+						<div class="select">
+							<select :disabled="disabled" v-model="periodInput.relativeTo">
+								<option :value="REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE">{{ $t('task.attributes.dueDate') }}</option>
+								<option :value="REMINDER_PERIOD_RELATIVE_TO_TYPES.STARTDATE">{{ $t('task.attributes.startDate')}}</option>
+								<option :value="REMINDER_PERIOD_RELATIVE_TO_TYPES.ENDDATE">{{ $t('task.attributes.endDate') }}</option>
+							</select>
+						</div>
 					</div>
-					<div class="select">
-						<select :disabled="disabled" v-model="periodInput.relativeTo" id="relativeTo">
-							<option :value="REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE">{{ $t('task.attributes.dueDate') }}</option>
-							<option :value="REMINDER_PERIOD_RELATIVE_TO_TYPES.STARTDATE">{{
-									$t('task.attributes.startDate')
-								}}
-							</option>
-							<option :value="REMINDER_PERIOD_RELATIVE_TO_TYPES.ENDDATE">{{ $t('task.attributes.endDate') }}</option>
-						</select>
-					</div>
-				</div>
-				<div class="control">
-					<x-button
+
+					<div class="control">
+						<x-button
 							:disabled="disabled"
 							class="close-button"
 							:shadow="false"
 							@click="submitForm"
-					>
-						{{ $t('misc.confirm') }}
-					</x-button>
+						>
+							{{ $t('misc.confirm') }}
+						</x-button>
+					</div>
 				</div>
-			</div>
-		</CustomTransition>
+			</template>
+		</Popup>
 	</div>
 </template>
 
 <script setup lang="ts">
+import {reactive, ref, watch, type PropType, computed} from 'vue'
+import {useI18n} from 'vue-i18n'
+
 import BaseButton from '@/components/base/BaseButton.vue'
-import CustomTransition from '@/components/misc/CustomTransition.vue'
-import {closeWhenClickedOutside} from '@/helpers/closeWhenClickedOutside'
+import Popup from '@/components/misc/popup.vue'
+
 import {periodToSeconds, secondsToPeriod} from '@/helpers/time/period'
+
 import TaskReminderModel from '@/models/taskReminder'
+
 import type {ITaskReminder} from '@/modelTypes/ITaskReminder'
 import {REMINDER_PERIOD_RELATIVE_TO_TYPES, type IReminderPeriodRelativeTo} from '@/types/IReminderPeriodRelativeTo'
-import {onMounted, onBeforeUnmount, reactive, ref, watch, type PropType} from 'vue'
-import {useI18n} from 'vue-i18n'
 
 const {t} = useI18n({useScope: 'global'})
 
@@ -87,22 +105,23 @@ const props = defineProps({
 	},
 })
 
-const emit = defineEmits(['update:modelValue', 'close', 'close-on-change'])
+const emit = defineEmits(['update:modelValue'])
 
 const reminder = ref<ITaskReminder>()
-const isShowForm = ref(false)
 
 const periodInput = reactive({
-	duration: {days: 0, hours: 0, minutes: 0, seconds: 0},
+	duration: {
+		days: 0,
+		hours: 0,
+		minutes: 0,
+		seconds: 0
+	},
 	relativeTo: REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE,
 	sign: -1,
 })
 
-onMounted(() => document.addEventListener('click', hidePeriodPopup))
-onBeforeUnmount(() => document.removeEventListener('click', hidePeriodPopup))
-
 watch(
-		() => props.modelValue,
+		props.modelValue,
 		(value) => {
 			reminder.value = value
 			if (value && value.relativeTo != null) {
@@ -121,28 +140,13 @@ watch(
 function updateData() {
 	changed.value = true
 	if (reminder.value) {
-		reminder.value.relativePeriod = parseInt(periodInput.sign) * periodToSeconds(periodInput.duration.days, periodInput.duration.hours, periodInput.duration.minutes, 0)
+		reminder.value.relativePeriod = periodInput.sign * periodToSeconds(periodInput.duration.days, periodInput.duration.hours, periodInput.duration.minutes, 0)
 		reminder.value.relativeTo = periodInput.relativeTo
 		reminder.value.reminder = null
 	}
 	emit('update:modelValue', reminder.value)
 }
 
-function togglePeriodPopup() {
-	if (props.disabled) {
-		return
-	}
-	isShowForm.value = !isShowForm.value
-}
-
-const periodPopup = ref<HTMLElement | null>(null)
-
-function hidePeriodPopup(e: MouseEvent) {
-	if (isShowForm.value) {
-		closeWhenClickedOutside(e, periodPopup.value, close)
-	}
-}
-
 function submitForm() {
 	updateData()
 	close()
@@ -153,10 +157,8 @@ const changed = ref(false)
 function close() {
 	setTimeout(() => {
 		isShowForm.value = false
-		emit('close', changed.value)
 		if (changed.value) {
 			changed.value = false
-			emit('close-on-change', changed.value)
 		}
 	}, 200)
 }
@@ -171,6 +173,16 @@ function formatDuration(reminderPeriod: number): string {
 			('' + duration.minutes).padStart(2, '0')
 }
 
+const relativeToOptions = {
+	[REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE]: t('task.attributes.dueDate'),
+	[REMINDER_PERIOD_RELATIVE_TO_TYPES.STARTDATE]: t('task.attributes.startDate'),
+	[REMINDER_PERIOD_RELATIVE_TO_TYPES.ENDDATE]: t('task.attributes.endDate'),
+} as const
+
+const relativeTo = computed(() => relativeToOptions[periodInput.relativeTo]))
+
+
+
 function formatRelativeTo(relativeTo: IReminderPeriodRelativeTo | null): string | null {
 	switch (relativeTo) {
 		case REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE:
diff --git a/src/components/tasks/partials/reminders.story.vue b/src/components/tasks/partials/reminders.story.vue
new file mode 100644
index 00000000..05f25e54
--- /dev/null
+++ b/src/components/tasks/partials/reminders.story.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+import reminders from './reminders.vue'
+</script>
+
+<template>
+  <Story>
+    <Variant title="Default">
+      <reminders />
+    </Variant>
+  </Story>
+</template>
diff --git a/src/components/tasks/partials/reminders.vue b/src/components/tasks/partials/reminders.vue
index a4e54083..f785d216 100644
--- a/src/components/tasks/partials/reminders.vue
+++ b/src/components/tasks/partials/reminders.vue
@@ -1,32 +1,41 @@
 <template>
 	<div class="reminders">
-		<div v-for="(r, index) in reminders" :key="index" :class="{ 'overdue': r.reminder < new Date() }" class="reminder-input">
+		<div
+			v-for="(r, index) in reminders"
+			:key="index"
+			:class="{ 'overdue': r.reminder < new Date() }"
+			class="reminder-input"
+		>
 			<div class="reminder-detail">
-				<ReminderDetail :disabled="disabled" v-model="reminders[index]" @update:modelValue="() => editReminder(index)"/>
+				<ReminderDetail :disabled="disabled" v-model="reminders[index]" />
 			</div>
 			<div>
-				<BaseButton @click="removeReminderByIndex(index)" v-if="!disabled" class="remove">
-					<icon icon="times"></icon>
+				<BaseButton v-if="!disabled"  @click="removeReminderByIndex(index)" class="remove">
+					<icon icon="times" />
 				</BaseButton>
 			</div>
 		</div>
-		<div class="reminder-input">
-			<BaseButton @click.stop="toggleAddReminder"  v-if="!disabled">
+
+		<div v-if="!disabled" class="reminder-input">
+			<BaseButton @click="toggleAddReminder">
 				{{ $t('task.addReminder') }}
 			</BaseButton>
 		</div>
-		<div class="reminder-input">
-			<ReminderDetail v-if="isAddReminder" :disabled="disabled" @update:modelValue="addNewReminder"/>
+
+		<div v-if="isAddReminder" class="reminder-input">
+			<ReminderDetail :disabled="disabled" @update:modelValue="addNewReminder"/>
 		</div>
 	</div>
 </template>
 
 <script setup lang="ts">
+import {reactive, ref, watch, type PropType} from 'vue'
+
+import type { ITaskReminder } from '@/modelTypes/ITaskReminder'
+
 import BaseButton from '@/components/base/BaseButton.vue'
 import ReminderDetail from '@/components/tasks/partials/reminder-detail.vue'
 import TaskReminderModel from '@/models/taskReminder'
-import type { ITaskReminder } from '@/modelTypes/ITaskReminder'
-import { onMounted, reactive, ref, watch, type PropType } from 'vue'
 
 const props = defineProps({
 	modelValue: {
@@ -42,15 +51,12 @@ const emit = defineEmits(['update:modelValue'])
 
 const reminders = ref<ITaskReminder[]>([])
 
-onMounted(() => {
-	reminders.value = [...props.modelValue]
-})
-
 watch(
-		() => props.modelValue,
-		(newVal) => {
-			reminders.value = newVal
-		},
+	props.modelValue,
+	(newVal) => {
+		reminders.value = newVal
+	},
+	{immediate: true},
 )
 
 const isAddReminder = ref(false)
@@ -86,28 +92,25 @@ function removeReminderByIndex(index: number) {
 </script>
 
 <style lang="scss" scoped>
-.reminders {
-	.reminder-input {
-		display: flex;
-		align-items: center;
+.reminder-input {
+	display: flex;
+	align-items: center;
 
-		&.overdue :deep(.datepicker .show) {
-			color: var(--danger);
-		}
+	&.overdue :deep(.datepicker .show) {
+		color: var(--danger);
+	}
 
-		&:last-child {
-			margin-bottom: 0.75rem;
-		}
-
-		.reminder-detail {
-			width: 100%;
-		}
-		.remove {
-			color: var(--danger);
-			vertical-align: top;
-			padding-left: .5rem;
-			line-height: 1;
-		}
+	&::last-child {
+		margin-bottom: 0.75rem;
 	}
 }
+.reminder-detail {
+	width: 100%;
+}
+.remove {
+	color: var(--danger);
+	vertical-align: top;
+	padding-left: .5rem;
+	line-height: 1;
+}
 </style>
\ No newline at end of file