fix UI issue #EMM-595