Fixed exception in dialogs
Merge pull request #2362 from dinhviethoa/fix-dialogs

Fixed exception in dialogs