Updated handling of the stop menu