diff --git a/extra/n900/etc/profile.d/nokia-n900-keymap.sh b/extra/n900/etc/profile.d/nokia-n900-keymap.sh
index 5d3e05e..692b01a 100644
--- a/extra/n900/etc/profile.d/nokia-n900-keymap.sh
+++ b/extra/n900/etc/profile.d/nokia-n900-keymap.sh
@@ -1 +1,6 @@
-/bin/busybox loadkmap < /etc/nokia-n900.kmap
+# Setup Nokia N900 keymap either on console or Xorg
+if [ -n "$DISPLAY" ]; then
+	setxkbmap -rules evdev -model nokiarx51 -layout us -variant ",qwerty"
+else
+	/bin/busybox loadkmap < /etc/nokia-n900.kmap
+fi