Fixed support for desktop mode.