Fixing bug related to popover not showing in Modal