#697 | +Vishal +Jaideep | Retaining focus inside the dialog modal