diff -Naur xfce4-xkb-plugin-0.5.3.3.orig//panel-plugin/xkb-settings-dialog.c xfce4-xkb-plugin-0.5.3.3//panel-plugin/xkb-settings-dialog.c --- xfce4-xkb-plugin-0.5.3.3.orig//panel-plugin/xkb-settings-dialog.c 2010-10-04 13:21:23.000000000 +0300 +++ xfce4-xkb-plugin-0.5.3.3//panel-plugin/xkb-settings-dialog.c 2010-10-04 13:21:53.000000000 +0300 @@ -831,9 +831,11 @@ gint i = 0; model = GTK_TREE_MODEL (xkb->combo_store); - gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter); - gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1); - kbd_config->model = kbdmodel; + if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter)) + { + gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1); + kbd_config->model = kbdmodel; + } model = GTK_TREE_MODEL (xkb->toggle_options_store); if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->toggle_options_combo), &iter))