Fix create button behavior