VE-1134 Fixing the issue that the first publish button is not always clicked