Fixing undesired UI change