Fix for cancel submit of toolbar