CMS-3129 Live Edit - Component selection goes bad after choosing an image