2350023 move setting current widget to submit function