More work for fullscreen app mode