Simplify geometry picker input

I have a workflow where at one point a user can enter a geometry using the geometry picker.

If the user wants to change that location later, he needs to clear the geometry picker first, then click on the geometry picker's button again to activate capturing mode, and finally click on the map. Users are rightly complaining that this is unnecessarily complicated.

Is there a better way to enter a geometry? I remember the Capture Geometry activity from the old workflows which was a better choice in some cases. Workflow 5 does not seem to have anything like that.