Base: Fix cancel buttons not working correctly