diff --git a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
index 8bf4abbde6..cc29433eba 100644
--- a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
@@ -31,5 +31,5 @@
     <setting id="SAMBA_PASSWORD" value="openelec" />
     <setting id="UPDATE_AUTO" value="manual" />
     <setting id="X11_KEYMAP" value="us" />
-    <setting id="X11_KEYMAP2" value="" />
+    <setting id="X11_KEYMAP2" value="-none-" />
 </settings>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
index f09078cb27..f9b0662d7b 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
@@ -6,7 +6,7 @@
 		<setting label="2010" type="lsep"/>
 		<setting type="sep" />
 		<setting id="X11_KEYMAP" type="labelenum" label="2011" values="ad|af|al|am|ara|at|az|ba|bd|be|bg|br|bt|bw|by|ca|cd|ch|cn|cz|de|dk|ee|epo|es|et|fi|fo|fr|gb|gr|hr|hu|ie|il|in|iq|ir|is|it|jp|ke|kg|kh|kr|kz|la|latam|latin|lk|lt|lv|ma|mao|me|mk|ml|mm|mn|mt|mv|ng|nl|no|np|pc|pk|pl|pt|ro|rs|ru|se|si|sk|sn|sy|th|tj|tm|tr|tz|ua|us|uz|vn|za" sort="yes" default="us"/>
-                <setting id="X11_KEYMAP2" type="labelenum" label="2012" values="|ad|af|al|am|ara|at|az|ba|bd|be|bg|br|bt|bw|by|ca|cd|ch|cn|cz|de|dk|ee|epo|es|et|fi|fo|fr|gb|gr|hr|hu|ie|il|in|iq|ir|is|it|jp|ke|kg|kh|kr|kz|la|latam|latin|lk|lt|lv|ma|mao|me|mk|ml|mm|mn|mt|mv|ng|nl|no|np|pc|pk|pl|pt|ro|rs|ru|se|si|sk|sn|sy|th|tj|tm|tr|tz|ua|us|uz|vn|za" sort="yes" default=""/>
+                <setting id="X11_KEYMAP2" type="labelenum" label="2012" values="-none-|ad|af|al|am|ara|at|az|ba|bd|be|bg|br|bt|bw|by|ca|cd|ch|cn|cz|de|dk|ee|epo|es|et|fi|fo|fr|gb|gr|hr|hu|ie|il|in|iq|ir|is|it|jp|ke|kg|kh|kr|kz|la|latam|latin|lk|lt|lv|ma|mao|me|mk|ml|mm|mn|mt|mv|ng|nl|no|np|pc|pk|pl|pt|ro|rs|ru|se|si|sk|sn|sy|th|tj|tm|tr|tz|ua|us|uz|vn|za" sort="yes" default="-none-"/>
 		<setting label="2020" type="lsep"/>
 		<setting type="sep" />
 		<setting id="UPDATE_AUTO" type="labelenum" label="2021" values="no|manual|auto" sort="yes" default="manual" />
diff --git a/packages/x11/app/setxkbmap/scripts/xkb-setup b/packages/x11/app/setxkbmap/scripts/xkb-setup
index 7acd7f2a68..a2498b336a 100755
--- a/packages/x11/app/setxkbmap/scripts/xkb-setup
+++ b/packages/x11/app/setxkbmap/scripts/xkb-setup
@@ -24,12 +24,14 @@
 . /var/config/settings.conf
 
 if [ -z $X11_KEYMAP ]; then
-  XKBLAYOUT="us"
+  X11_KEYMAP="us"
 fi
 
-if [ ! -z $X11_KEYMAP2 ]; then
+if [ ! "$X11_KEYMAP2" == "-none-" ]; then
   XKBLAYOUT="$X11_KEYMAP,$X11_KEYMAP2"
   XKBOPTIONS="grp:alt_shift_toggle"
+else
+  XKBLAYOUT="$X11_KEYMAP"
 fi
 
 echo "XKBMODEL=\"pc105\""