diff --git a/src/components/gameMaster/mapEditor/partials/TeleportModal.vue b/src/components/gameMaster/mapEditor/partials/TeleportModal.vue
index 94a17d8..8d4f5e1 100644
--- a/src/components/gameMaster/mapEditor/partials/TeleportModal.vue
+++ b/src/components/gameMaster/mapEditor/partials/TeleportModal.vue
@@ -41,13 +41,13 @@
 <script setup lang="ts">
 import type { Map } from '@/application/types'
 import Modal from '@/components/utilities/Modal.vue'
-import { useMapEditorStore } from '@/stores/mapEditorStore'
 import { computed, onMounted, ref, useTemplateRef, watch } from 'vue'
 import {MapStorage} from "@/storage/storages";
+import {useMapEditorComposable} from "@/composables/useMapEditorComposable";
 
-const showTeleportModal = computed(() => mapEditorStore.tool === 'pencil' && mapEditorStore.drawMode === 'teleport')
+const showTeleportModal = computed(() => mapEditor.tool.value === 'pencil' && mapEditor.drawMode.value === 'teleport')
 const mapStorage = new MapStorage()
-const mapEditorStore = useMapEditorStore()
+const mapEditor = useMapEditorComposable()
 const modalRef = useTemplateRef('modalRef')
 const mapList = ref<Map[]>([])
 
@@ -58,7 +58,7 @@ defineExpose({
 const { toPositionX, toPositionY, toRotation, toMap } = useRefTeleportSettings()
 
 function useRefTeleportSettings() {
-  const settings = mapEditorStore.teleportSettings
+  const settings = mapEditor.teleportSettings.value
   return {
     toPositionX: ref(settings.toPositionX),
     toPositionY: ref(settings.toPositionY),
@@ -70,7 +70,7 @@ function useRefTeleportSettings() {
 watch([toPositionX, toPositionY, toRotation, toMap], updateTeleportSettings)
 
 function updateTeleportSettings() {
-  mapEditorStore.setTeleportSettings({
+  mapEditor.setTeleportSettings({
     toPositionX: toPositionX.value,
     toPositionY: toPositionY.value,
     toRotation: toRotation.value,