diff --git a/SketchWidget.py b/SketchWidget.py
index bc03fe2..91a6dad 100644
--- a/SketchWidget.py
+++ b/SketchWidget.py
@@ -630,4 +630,7 @@ class ConnectMode(Mode):
                 sw.invalidate()
 
     def do_right_click(self, sw, x, y):
-        sw.window.set_mode('')
+        if self.first_ptref is not None:
+            self.first_ptref = None
+        else:
+            sw.window.set_mode('')