Check if dialog is showing before dismissing
Fix merge conflict