diff --git a/labelme/widgets/canvas.py b/labelme/widgets/canvas.py
index 7ae95c070217d44f4da9cb422d37203b29609129..b01e782a23cb45afaa5b2face018bc7d9b2d53ed 100644
--- a/labelme/widgets/canvas.py
+++ b/labelme/widgets/canvas.py
@@ -151,7 +151,6 @@ class Canvas(QtWidgets.QWidget):
         if self.hShape:
             self.hShape.highlightClear()
             self.update()
-        self.hVertex, self.hShape, self.hEdge = None, None, None
 
     def selectedVertex(self):
         return self.hVertex is not None
@@ -272,13 +271,11 @@ class Canvas(QtWidgets.QWidget):
         self.vertexSelected.emit(self.hVertex is not None)
 
     def addPointToEdge(self):
-        if (self.hShape is None and
-                self.hEdge is None and
-                self.prevMovePoint is None):
-            return
         shape = self.hShape
         index = self.hEdge
         point = self.prevMovePoint
+        if shape is None or index is None or point is None:
+            return
         shape.insertPoint(index, point)
         shape.highlightVertex(index, shape.MOVE_VERTEX)
         self.hShape = shape