diff -up gnome-control-center-2.26.0/capplets/keyboard/gnome-keyboard-properties-xkb.c.xkb-init gnome-control-center-2.26.0/capplets/keyboard/gnome-keyboard-properties-xkb.c
--- gnome-control-center-2.26.0/capplets/keyboard/gnome-keyboard-properties-xkb.c.xkb-init	2009-04-29 21:53:58.375883837 -0400
+++ gnome-control-center-2.26.0/capplets/keyboard/gnome-keyboard-properties-xkb.c	2009-04-29 21:54:21.511849642 -0400
@@ -159,7 +159,7 @@ setup_xkb_tabs (GladeXML * dialog, GConf
 
 	gkbd_keyboard_config_init (&initial_config, xkb_gconf_client,
 				   engine);
-	gkbd_keyboard_config_load_from_x_initial (&initial_config, NULL);
+	gkbd_keyboard_config_load_from_x_current (&initial_config, NULL);
 
 	setup_model_entry (dialog);