diff --git a/CHANGELOG.md b/CHANGELOG.md
index d42ffae257aa..55ce996fe2a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Issue with point region doesn't work in Firefox (<https://github.com/openvinotoolkit/cvat/pull/2727>)
 - Fixed cuboid perpective change (<https://github.com/openvinotoolkit/cvat/pull/2733>)
 - Annotation page popups (ai tools, drawing) reset state after detecting, tracking, drawing (<https://github.com/openvinotoolkit/cvat/pull/2780>)
+- Polygon editing using trailing point (<https://github.com/openvinotoolkit/cvat/pull/2808>)
 
 ### Security
 
diff --git a/cvat-canvas/package-lock.json b/cvat-canvas/package-lock.json
index 48b5ea18383c..de4b537c6142 100644
--- a/cvat-canvas/package-lock.json
+++ b/cvat-canvas/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-canvas",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/cvat-canvas/package.json b/cvat-canvas/package.json
index aace7d6b4745..3a83007cb248 100644
--- a/cvat-canvas/package.json
+++ b/cvat-canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-canvas",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "Part of Computer Vision Annotation Tool which presents its canvas library",
   "main": "src/canvas.ts",
   "scripts": {
diff --git a/cvat-canvas/src/typescript/editHandler.ts b/cvat-canvas/src/typescript/editHandler.ts
index c10450bc90fa..ed88002450b9 100644
--- a/cvat-canvas/src/typescript/editHandler.ts
+++ b/cvat-canvas/src/typescript/editHandler.ts
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2020 Intel Corporation
+// Copyright (C) 2019-2021 Intel Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -93,7 +93,9 @@ export class EditHandlerImpl implements EditHandler {
                     (this.editLine as any).draw('point', e);
                 } else {
                     const deltaTreshold = 15;
-                    const delta = Math.sqrt((e.clientX - lastDrawnPoint.x) ** 2 + (e.clientY - lastDrawnPoint.y) ** 2);
+                    const dxsqr = (e.clientX - lastDrawnPoint.x) ** 2;
+                    const dysqr = (e.clientY - lastDrawnPoint.y) ** 2;
+                    const delta = Math.sqrt(dxsqr + dysqr);
                     if (delta > deltaTreshold) {
                         (this.editLine as any).draw('point', e);
                     }
@@ -103,7 +105,7 @@ export class EditHandlerImpl implements EditHandler {
 
         this.editLine = (this.canvas as any).polyline();
         if (this.editData.state.shapeType === 'polyline') {
-            (this.editLine as any).on('drawpoint', (e: CustomEvent): void => {
+            (this.editLine as any).on('drawupdate', (e: CustomEvent): void => {
                 const circle = (e.target as any).instance.remember('_paintHandler').set.last();
                 if (circle) this.setupTrailingPoint(circle);
             });
@@ -208,11 +210,11 @@ export class EditHandlerImpl implements EditHandler {
         }
 
         const cutIndexes1 = oldPoints.reduce(
-            (acc: string[], _: string, i: number) => (i >= stop || i <= start ? [...acc, i] : acc),
+            (acc: number[], _: string, i: number): number[] => (i >= stop || i <= start ? [...acc, i] : acc),
             [],
         );
         const cutIndexes2 = oldPoints.reduce(
-            (acc: string[], _: string, i: number) => (i <= stop && i >= start ? [...acc, i] : acc),
+            (acc: number[], _: string, i: number): number[] => (i <= stop && i >= start ? [...acc, i] : acc),
             [],
         );
 
@@ -223,7 +225,9 @@ export class EditHandlerImpl implements EditHandler {
                 .map((point: string[]): number[] => [+point[0], +point[1]]);
             let length = 0;
             for (let i = 1; i < points.length; i++) {
-                length += Math.sqrt((points[i][0] - points[i - 1][0]) ** 2 + (points[i][1] - points[i - 1][1]) ** 2);
+                const dxsqr = (points[i][0] - points[i - 1][0]) ** 2;
+                const dysqr = (points[i][1] - points[i - 1][1]) ** 2;
+                length += Math.sqrt(dxsqr + dysqr);
             }
 
             return length;