Anyone else annoyed in Acrobat Pro that the comment tool doesn't go back to "Select" after "Draw"?

When I Draw a rectangle or text callout from the commenting toolbar, it seems to me that the tool used to revert back to the Select tool so I could move or manipulate the rectangle or text box. My muscle memory seems to think so, at least! Now it stays on whatever shape I drew, so I just keep drawing boxes on top of boxes while I'm clicking around trying to move the shape I just drew or to enter text. Is there a way to change this so it defaults back to the old way? I can't imagine why I would want to just draw endless rectangles, and it's time consuming switching back and forth between tools when I'm annotating a large piece on a deadline. It's a minor inconvenience, but I find it pretty annoying.