Added flag to store if initial dialog has been show