diff --git a/SketchWidget.py b/SketchWidget.py
index 95289b9..163134a 100644
--- a/SketchWidget.py
+++ b/SketchWidget.py
@@ -396,6 +396,8 @@ class SketchWidget:
                 self.drawingConstraints['c2'] = c
                 pt = self.hover_snap_ptref.getPt()
                 self.drawingShape.setPt(1, pt)
+                # don't do a horizontal/vertical when snapping
+                self.drawingConstraints['hv'] = None
             self.merge_in_drawing_shape()
             start = prev_line.getPt(1)
             start_pt_ref = PointRef(prev_line, 1)
@@ -479,7 +481,8 @@ class SketchWidget:
     def merge_in_drawing_shape(self):
         self.sketch.shapes.append(self.drawingShape)
         for c in self.drawingConstraints:
-            self.sketch.constraints.append(self.drawingConstraints[c])
+            if self.drawingConstraints[c] is not None:
+                self.sketch.constraints.append(self.drawingConstraints[c])
         self.drawingShape = None
         self.drawingConstraints = {}