Fix UI issue with unfold