Dc,Melanie | #2950 | UI bug fix