Index: libgnomekbd-3.28.0/libgnomekbd/gkbd-keyboard-display.c
===================================================================
--- libgnomekbd-3.28.0.orig/libgnomekbd/gkbd-keyboard-display.c
+++ libgnomekbd-3.28.0/libgnomekbd/gkbd-keyboard-display.c
@@ -82,7 +82,7 @@ main (int argc, char **argv)
 	dlg = gkbd_keyboard_drawing_dialog_new ();
 	registry = xkl_config_registry_get_instance (engine);
 	xkl_config_registry_load (registry, TRUE);
-	if (layout != NULL) {
+        if (layout != NULL && strcmp(layout, "default")) {
 		gkbd_keyboard_drawing_dialog_set_layout (dlg, registry,
 							 layout);
 	} else