Fixed issue with unexpected modal dialog popup.