diff --git a/src/components/tools/polygon/PolygonSVG2D.vue b/src/components/tools/polygon/PolygonSVG2D.vue
index bcc5e6d82..4d5ffc87d 100644
--- a/src/components/tools/polygon/PolygonSVG2D.vue
+++ b/src/components/tools/polygon/PolygonSVG2D.vue
@@ -37,6 +37,7 @@ import {
   watch,
   inject,
 } from 'vue';
+import { Maybe } from '@/src/types';
 
 const POINT_RADIUS = 10;
 const FINISHABLE_POINT_RADIUS = 16;
@@ -53,7 +54,7 @@ export default defineComponent({
       required: true,
     },
     movePoint: {
-      type: Array as unknown as PropType<Vector3>,
+      type: Array as unknown as PropType<Maybe<Vector3>>,
     },
     placing: {
       type: Boolean,
diff --git a/src/components/tools/polygon/PolygonWidget2D.vue b/src/components/tools/polygon/PolygonWidget2D.vue
index 9ebf50a68..ec0d213a7 100644
--- a/src/components/tools/polygon/PolygonWidget2D.vue
+++ b/src/components/tools/polygon/PolygonWidget2D.vue
@@ -1,6 +1,7 @@
 <script lang="ts">
 import vtkWidgetManager from '@kitware/vtk.js/Widgets/Core/WidgetManager';
 import {
+  reactive,
   computed,
   defineComponent,
   onMounted,
@@ -23,6 +24,8 @@ import { PolygonID as ToolID } from '@/src/types/polygon';
 import vtkWidgetFactory, {
   vtkPolygonViewWidget as WidgetView,
 } from '@/src/vtk/PolygonWidget';
+import { Maybe } from '@/src/types';
+import { Vector3 } from '@kitware/vtk.js/types';
 import SVG2DComponent from './PolygonSVG2D.vue';
 
 export default defineComponent({
@@ -148,17 +151,22 @@ export default defineComponent({
       widgetManager.value.renderWidgets();
     });
 
-    // when movePoint/mouse changes, get finishable manually as its not in store
-    const finishable = ref(false);
-    const movePoint = computed(() => tool.value?.movePoint);
-    watch([movePoint], () => {
-      finishable.value =
-        !!widget.value && widget.value.getWidgetState().getFinishable();
+    // --- //
+
+    const editState = reactive({
+      movePoint: null as Maybe<Vector3>,
+      finishable: false,
+    });
+
+    const widgetState = widgetFactory.getWidgetState();
+    onVTKEvent(widgetState, 'onModified', () => {
+      editState.movePoint = widgetState.getMoveHandle().getOrigin();
+      editState.finishable = widgetState.getFinishable();
     });
 
     return {
       tool,
-      finishable,
+      editState,
     };
   },
 });
@@ -170,8 +178,8 @@ export default defineComponent({
     :view-id="viewId"
     :points="tool.points"
     :color="tool.color"
-    :move-point="tool.movePoint"
+    :move-point="editState.movePoint"
     :placing="tool.placing"
-    :finishable="finishable"
+    :finishable="editState.finishable"
   />
 </template>
diff --git a/src/store/tools/polygons.ts b/src/store/tools/polygons.ts
index 69f91d381..667bec4fb 100644
--- a/src/store/tools/polygons.ts
+++ b/src/store/tools/polygons.ts
@@ -7,7 +7,6 @@ import { Manifest, StateFile } from '@/src/io/state-file/schema';
 import { useAnnotationTool } from './useAnnotationTool';
 
 const toolDefaults = () => ({
-  movePoint: [0, 0, 0] as Vector3,
   points: [] as Array<Vector3>,
   id: '' as PolygonID,
   name: 'Polygon',