diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp
index 670b0b8fc0..67018f658e 100644
--- a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp
+++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp
@@ -71,6 +71,9 @@ void DrawSketchHandler::quit(void)
     sketchgui->drawEdit(std::vector<Base::Vector2d>());
     resetPositionText();
 
+    Gui::Selection().rmvSelectionGate();
+    Gui::Selection().rmvPreselect();
+
     unsetCursor();
     sketchgui->purgeHandler();
 }
diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
index b2923777de..7db70ee842 100644
--- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
@@ -5136,6 +5136,7 @@ bool ViewProviderSketch::setEdit(int ModNum)
 
     // clear the selection (convenience)
     Gui::Selection().clearSelection();
+    Gui::Selection().rmvPreselect();
 
     // create the container for the additional edit data
     assert(!edit);