Fix bug with dialog choices
Fix bug with keeping dialog value after show