diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp
index caa6c178c6..2fa922bcfc 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp
@@ -1708,6 +1708,7 @@ void TaskSketcherConstraints::slotConstraintsChanged()
     assert(sketchView);
 
     constraintMap.clear();
+    selectionBuffer.clear();
 
     // Build up ListView with the constraints
     const Sketcher::SketchObject* sketch = sketchView->getSketchObject();
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
index 98d5cefe6d..095c67b632 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
@@ -1875,6 +1875,7 @@ void TaskSketcherElements::slotElementsChanged()
 
     ui->listWidgetElements->clear();
     elementMap.clear();
+    selectionBuffer.clear();
 
     using GeometryState = ElementItem::GeometryState;