WEB-37 for desktop version