End repeating action when deactivating a tool

We have configured a repeating action on the Draw tool to allow users to draw multiple shapes in a single drawing session. The repeating action can only be cancelled by hitting the Esc key or but clicking the X in the notification at the top of the page. 

The repeating action continues to run if you click on the Draw tool to deactivated it. This feels unintuitive. Can a repeating action on a tool be cancelled when the tool is deactivated?