diff --git a/SketchWidget.py b/SketchWidget.py
index b07ed74..cf20895 100644
--- a/SketchWidget.py
+++ b/SketchWidget.py
@@ -367,6 +367,8 @@ class SketchWidget:
                 else:
                     self.widget.window.set_cursor(self.cursors['arrow'])
             self.mode = mode
+            self.drawingShape = None
+            self.drawingConstraints = []
 
     def do_line_left_click(self, x, y):
         start = self.screenPtToPt((x, self.size[1] - y))