Better handling of screen kill