diff --git a/src/gui/gui-draw-lines2.mjs b/src/gui/gui-draw-lines2.mjs
index 78db6818..caeef81a 100644
--- a/src/gui/gui-draw-lines2.mjs
+++ b/src/gui/gui-draw-lines2.mjs
@@ -115,12 +115,12 @@ export function initLineEditing(gui, ext, hit) {
     } else {
       deleteLastVertex(target);
     }
-    if (getLastArcLength(target) < 2) {
-      gui.undo.undo(); // remove the path
-    }
     if (e.shapes) {
       replaceDrawnShapes(e.shapes);
     }
+    if (getLastArcLength(target) < 2) {
+      gui.undo.undo(); // remove the path
+    }
   });
 
   function turnOn() {
diff --git a/src/gui/gui-mouse.mjs b/src/gui/gui-mouse.mjs
index b68a4abd..8f3e25f1 100644
--- a/src/gui/gui-mouse.mjs
+++ b/src/gui/gui-mouse.mjs
@@ -134,7 +134,9 @@ export function MouseArea(element, pos) {
     }
   });
   element.addEventListener('contextmenu', function(e) {
-    _self.dispatchEvent('contextmenu', procMouseEvent(e));
+    if (!e.ctrlKey) {
+      _self.dispatchEvent('contextmenu', procMouseEvent(e));
+    }
   });
 
   this.enable = function() {