That's nothing special for a new UI, but we can add this logic.