diff --git a/panels/region/gnome-region-panel-xkbltadd.c b/panels/region/gnome-region-panel-xkbltadd.c
index 0537c9084..cb514690f 100644
--- a/panels/region/gnome-region-panel-xkbltadd.c
+++ b/panels/region/gnome-region-panel-xkbltadd.c
@@ -404,6 +404,7 @@ xkb_layout_chooser_response (GtkDialog * dialog,
 	gtk_window_get_size (GTK_WINDOW (dialog), &rect.width,
 			     &rect.height);
 	gkbd_preview_save_position (&rect);
+	gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
 void
@@ -505,8 +506,7 @@ xkb_layout_choose (GtkBuilder * dialog)
 	}
 
 	xkb_layout_preview_update (chooser_dialog);
-	gtk_dialog_run (GTK_DIALOG (chooser));
-	gtk_widget_destroy (chooser);
+	gtk_widget_show (chooser);
 }
 
 gchar *
diff --git a/panels/region/gnome-region-panel-xkbmc.c b/panels/region/gnome-region-panel-xkbmc.c
index dd11db435..33a5dd96c 100644
--- a/panels/region/gnome-region-panel-xkbmc.c
+++ b/panels/region/gnome-region-panel-xkbmc.c
@@ -299,18 +299,19 @@ xkb_model_chooser_response (GtkDialog * dialog,
 			g_free (model_name);
 		}
 	}
+	gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
 void
 choose_model (GtkBuilder * dialog)
 {
 	GtkBuilder *chooser_dialog;
-    GtkWidget *chooser;
-    
-    chooser_dialog = gtk_builder_new ();
-    gtk_builder_add_from_file (chooser_dialog, GNOMECC_UI_DIR
-                               "/gnome-region-panel-model-chooser.ui",
-                               NULL);
+	GtkWidget *chooser;
+
+	chooser_dialog = gtk_builder_new ();
+	gtk_builder_add_from_file (chooser_dialog, GNOMECC_UI_DIR
+				   "/gnome-region-panel-model-chooser.ui",
+				   NULL);
 	chooser = CWID ("xkb_model_chooser");
 	gtk_window_set_transient_for (GTK_WINDOW (chooser),
 				      GTK_WINDOW (WID
@@ -331,7 +332,6 @@ choose_model (GtkBuilder * dialog)
 			  "response",
 			  G_CALLBACK (xkb_model_chooser_response),
 			  chooser_dialog);
-	gtk_dialog_run (GTK_DIALOG (chooser));
-	gtk_widget_destroy (chooser);
+	gtk_widget_show (chooser);
 	g_free (current_model_name);
 }