Issue 3580 ui fix