Usability - User's can't finish/exit creating a geometry

Description

Through my experience with newbie users, most of them have problems when it comes to adding features.

Specifically, they quickly understand they can simply click on the map to create a feature. What they have problems with is that most click once to create a point, and then move on to add attributes. They dont understand that they first need to finish the 'adding geometry' step by clicking on the same point again first before moving on to adding attributes. So they create a line in the end while trying to edit attributes.

When they are creating ways, the same problem happens that they can't finish the adding geometry step.

This is a usability issue for which I do not have a clear answer, but some intuitive action for 'finishing editing geometry' should be found and applied consistently for editing points, lines, or closed ways.