Reselect shape after switching form selector to shape and back