Fix keyboard issues with new keyboard focus manager