Fix dialogs flow