Screen selection fix