diff --git a/SketchWidget.py b/SketchWidget.py
index 9fe047e..074a8ed 100644
--- a/SketchWidget.py
+++ b/SketchWidget.py
@@ -404,6 +404,8 @@ class SketchWidget(object):
                 self.cursor = c
                 self.widget.window.set_cursor(self.cursors[c])
             self.mode.start_mode(self)
+            self.set_hover_snap_point(None)
+            self.queue_redraw()
 
     def cancel_drawing_shape(self):
         if self.drawingShape is not None:
@@ -560,7 +562,6 @@ class LineMode(Mode):
     def do_right_click(self, sw, x, y):
         if sw.drawingShape is not None:
             sw.cancel_drawing_shape()
-            sw.queue_redraw()
         else:
             sw.window.set_mode('')
 
@@ -623,7 +624,6 @@ class CircleMode(Mode):
     def do_right_click(self, sw, x, y):
         if sw.drawingShape is not None:
             sw.cancel_drawing_shape()
-            sw.queue_redraw()
         else:
             sw.window.set_mode('')