diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js
index 2f106832..89a49c87 100644
--- a/editor/svgcanvas.js
+++ b/editor/svgcanvas.js
@@ -1875,6 +1875,11 @@ function SvgCanvas(c)
 			current_poly = null;
 			current_poly_pts = [];
 		}
+		else if (current_mode == "polyedit") {
+			removeAllPointGripsFromPoly();
+			current_poly = null;
+			current_poly_pts = [];
+		}
 		current_mode = name;
 	};