Base: Fix cancel button....again