Bug 1009368 - Configure keyboard correctly