Fixed bug that caused the selected tool to loose it's highlight following a click on the map