diff --git a/src/components/FormWishlist.vue b/src/components/FormWishlist.vue
index c826d46..67aafd4 100644
--- a/src/components/FormWishlist.vue
+++ b/src/components/FormWishlist.vue
@@ -51,12 +51,9 @@
 
 <script setup lang="ts">
 import { Wishlist } from '@/types'
-import { PropType } from 'vue'
-import { useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 import { Form } from 'vee-validate'
 import { object, string, boolean } from 'yup'
-import { useToast } from 'vue-toastification'
 import {
   ButtonBase,
   InputText,
@@ -65,19 +62,12 @@ import {
   InputTextArea,
 } from '@/components'
 import { IconSave } from '@/components/icons'
-import { useWishlistStore } from '@/composables'
 
-defineProps({
-  wishlist: {
-    type: Object as PropType<Wishlist>,
-    requried: true,
-  },
-})
+defineProps<{
+  wishlist: Wishlist
+}>()
 
-const router = useRouter()
-const toast = useToast()
-
-const { update } = useWishlistStore()
+const emits = defineEmits(['update'])
 
 const { t } = useI18n()
 
@@ -112,13 +102,7 @@ const schema = object().shape(
 )
 
 const onSubmit = async (values: any): Promise<void> => {
-  try {
-    values.imageSrc = values.imageFile || values.imageSrc
-    await update(values)
-    toast.success(t('common.wishlist.saved.text'))
-    router.push(`/${values.slugUrlText}`)
-  } catch (error) {
-    toast.error(t('common.wishlist.saving-failed.text'))
-  }
+  values.imageSrc = values.imageFile || values.imageSrc
+  emits('update', values)
 }
 </script>
diff --git a/src/views/DetailView.vue b/src/views/DetailView.vue
index ef6abe1..e5e6e01 100644
--- a/src/views/DetailView.vue
+++ b/src/views/DetailView.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n'
-import { WishlistItem as WishlistItemType } from '@/types'
-import { useRoute } from 'vue-router'
+import { Wishlist, WishlistItem as WishlistItemType } from '@/types'
+import { useRoute, useRouter } from 'vue-router'
 import { useWishlistStore, useModal, useEditMode } from '@/composables'
 import {
   FormWishlist,
@@ -10,17 +10,37 @@ import {
   FormWishlistItem,
 } from '@/components'
 import { IconNoGift } from '../components/icons'
+import { useToast } from 'vue-toastification'
 
 const route = useRoute()
+const router = useRouter()
 const modal = useModal()
 const { t } = useI18n()
+const toast = useToast()
 const { isActive: editModeIsActive } = useEditMode()
 
-const { state, fetch, isReady, itemBought, itemDelete, filteredItems } =
-  useWishlistStore()
+const {
+  state,
+  fetch,
+  isReady,
+  update,
+  itemBought,
+  itemDelete,
+  filteredItems,
+} = useWishlistStore()
 await fetch(route.params.slug as string)
 
-const bought = async (item: WishlistItemType): Promise<void> => {
+const handleUpdateWishlist = async (wishlist: Wishlist): Promise<void> => {
+  try {
+    await update(wishlist)
+    toast.success(t('common.wishlist.saved.text'))
+    router.push(`/${wishlist.slugUrlText}`)
+  } catch (error) {
+    toast.error(t('common.wishlist.saving-failed.text'))
+  }
+}
+
+const handleBought = async (item: WishlistItemType): Promise<void> => {
   const confirmed = await modal.show(
     t('pages.detail-view.modal-bought-item.title.text'),
     t('pages.detail-view.modal-bought-item.confirm-button.text'),
@@ -31,7 +51,7 @@ const bought = async (item: WishlistItemType): Promise<void> => {
     itemBought(item)
   }
 }
-const deleteItem = async (item: WishlistItemType): Promise<void> => {
+const handleDeleteItem = async (item: WishlistItemType): Promise<void> => {
   const confirmed = await modal.show(
     t('pages.detail-view.modal-delete-item.title.text'),
     t('pages.detail-view.modal-delete-item.confirm-button.text'),
@@ -58,7 +78,7 @@ const deleteItem = async (item: WishlistItemType): Promise<void> => {
           {{ state.description }}
         </p>
       </div>
-      <FormWishlist v-else :wishlist="state" />
+      <FormWishlist v-else :wishlist="state" @update="handleUpdateWishlist" />
     </div>
     <div
       v-if="filteredItems.length > 0"
@@ -68,9 +88,13 @@ const deleteItem = async (item: WishlistItemType): Promise<void> => {
         <WishlistItem
           v-if="!editModeIsActive"
           :item="item"
-          @bought="bought(item)"
+          @bought="handleBought(item)"
+        />
+        <FormWishlistItem
+          v-else
+          :item="item"
+          @delete="handleDeleteItem(item)"
         />
-        <FormWishlistItem v-else :item="item" @delete="deleteItem(item)" />
       </div>
     </div>
     <div v-else class="flex h-1/2 w-full justify-center">