Add the correct behavior when we request to quit