keyboard: Fix surface focusing

Bad rebase...