LPS-35992 Fix UI, sent to you as requested by BChan (see his last commit)