Dialog: Fix regression to (#8063) after fix (#8838)