Fixed remove button behavior