Fix Apply button behaviour.