Added ability to stop selection when editing