diff --git a/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue b/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
index d5d287c..19e295b 100644
--- a/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
+++ b/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
@@ -4,7 +4,7 @@
 </template>
 
 <script setup lang="ts">
-import type { PlacedMapObject as PlacedMapObjectT } from '@/application/types'
+import type { MapObject, PlacedMapObject as PlacedMapObjectT } from '@/application/types'
 import { uuidv4 } from '@/application/utilities'
 import { getTile } from '@/composables/mapComposable'
 import { useMapEditorStore } from '@/stores/mapEditorStore'
@@ -125,7 +125,7 @@ function objectPicker(pointer: Phaser.Input.Pointer) {
   if (!existingPlacedMapObject) return
 
   // Select the object
-  mapEditorStore.setSelectedMapObject(existingPlacedMapObject)
+  mapEditorStore.setSelectedMapObject(existingPlacedMapObject.mapObject)
 }
 
 function moveMapObject(id: string) {
@@ -205,18 +205,18 @@ onUnmounted(() => {
 // watch mapEditorStore.mapObjectList and update originX and originY of objects in mapObjects
 watch(
   () => mapEditorStore.mapObjectList,
-  (newObjects) => {
+  (newMapObjects) => {
     if (!mapEditorStore.map) return
 
     const updatedMapObjects = mapEditorStore.map.placedMapObjects.map((mapObject) => {
-      const updatedObject = newObjects.find((obj) => obj.id === mapObject.mapObject.id)
-      if (updatedObject) {
+      const updatedMapObject = newMapObjects.find((obj) => obj.id === mapObject.mapObject.id)
+      if (updatedMapObject) {
         return {
           ...mapObject,
           mapObject: {
             ...mapObject.mapObject,
-            originX: updatedObject.originX,
-            originY: updatedObject.originY
+            originX: updatedMapObject.originX,
+            originY: updatedMapObject.originY
           }
         }
       }
@@ -231,12 +231,12 @@ watch(
 
     // Update selectedMapObject if it's set
     if (mapEditorStore.selectedMapObject) {
-      const updatedObject = newObjects.find((obj) => obj.id === mapEditorStore.selectedMapObject?.id)
-      if (updatedObject) {
+      const updatedMapObject = newMapObjects.find((obj) => obj.id === mapEditorStore.selectedMapObject?.id)
+      if (updatedMapObject) {
         mapEditorStore.setSelectedMapObject({
           ...mapEditorStore.selectedMapObject,
-          originX: updatedObject.originX,
-          originY: updatedObject.originY
+          originX: updatedMapObject.originX,
+          originY: updatedMapObject.originY
         })
       }
     }