EZ-770: Enhancement, adding shortcut and list shortcut in a modal-box