Prevent event propagation from toolbar button clicks and tweak popup toolbar to disable editing when the map is clicked.