How to turn off continuous shape editor?

New install of Acrobat on new Win11 machine has a highly annoying "feature".   

Older version for adding a shape (circle, square, etc.) selected from within the Comment group, which we use frequently to mark up pdf images, drawings, etc.  You'd select the shape type, create the shape on the page, and that action would end.  You could go on to highlight text, or do some other different action.

NOW however, the shape creator remains active, so that any and every click on the page starts another instance of that shape.  You have to MANUALLY select the pointer in order to turn off shape creation.  Its VERY annoying and repetitive.

Is there a way to force a "one-and-done" instance when adding shapes to a document?