[Image Viewer Button Controlled] Fixed issue with saving state