I'm also looking for a solution to this problem. It seems disabling Ajax loading in the style editor solves the problem, but I'd rather not do that as I have some lengthy image-heavy pages where Ajax loading seems like it'd be beneficial.
@vuela Thanks so much for that code! It works ALMOST perfectly. For some reason the second button only shows after I refresh the page. Then if I navigate to a different page and back to that product page, it's gone again. But if I refresh, it's there. This is happening on all my product pages. I tried several different browsers, incognito mode, and mobile, so it seems like it's not a cache issue. Any ideas?