exit dialog behaviour improved