Fixed recently introduced issue with dynamic-dialog caused by breaking the button id in recent cleanups