diff --git a/src/components/DrawAppFormUtils.ts b/src/components/DrawAppFormUtils.ts
index 4496ac2..be1a9ca 100644
--- a/src/components/DrawAppFormUtils.ts
+++ b/src/components/DrawAppFormUtils.ts
@@ -17,7 +17,7 @@ export function useFormData<T extends GraphicDataBase>(
   });
 
   function onUpdate() {
-    const graphic = app.selectedGraphics[0];
+    const graphic = app.queryStore.queryById(data.id);
     if (graphic) {
       app.updateGraphicAndRecord(graphic, toRaw(data));
     }