diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog
index 6dd74f009..ce74b2a96 100644
--- a/capplets/background/ChangeLog
+++ b/capplets/background/ChangeLog
@@ -1,3 +1,12 @@
+2002-06-18  Jody Goldberg <jody@gnome.org>
+
+	http://bugzilla.gnome.org/show_bug.cgi?id=85628
+	* background-properties-capplet.c (main) : The dialog
+	    - should not be modal
+	    - has no parent to destroy with
+	    - and should have a seperator
+	    - set default response
+
 2002-06-17  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.0.0
diff --git a/capplets/background/background-properties-capplet.c b/capplets/background/background-properties-capplet.c
index 61e33eb97..62a7b8fff 100644
--- a/capplets/background/background-properties-capplet.c
+++ b/capplets/background/background-properties-capplet.c
@@ -225,16 +225,16 @@ update_color_widget_labels_and_visibility (ApplierSet *set, const gchar *value_s
 
 	switch (orientation) {
 	case ORIENTATION_SOLID: /* solid */ 
-		color1_string = _("C_olor"); 
+		color1_string = _("C_olor:"); 
 		two_colors = FALSE; 
 		break;
 	case ORIENTATION_HORIZ: /* horiz */ 
-		color1_string = _("_Left Color"); 
-		color2_string = _("_Right Color"); 
+		color1_string = _("_Left Color:"); 
+		color2_string = _("_Right Color:"); 
 		break;
 	case ORIENTATION_VERT: /* vert  */
-		color1_string = _("_Top Color");
-		color2_string = _("_Bottom Color"); 
+		color1_string = _("_Top Color:");
+		color2_string = _("_Bottom Color:"); 
 		break;
 	default:
 		break;
@@ -430,7 +430,7 @@ create_dialog (ApplierSet *set)
 
 	g_slist_free (group);
 
-	label = gtk_label_new_with_mnemonic (_("_Picture"));
+	label = gtk_label_new_with_mnemonic (_("Select _picture:"));
 	gtk_frame_set_label_widget (GTK_FRAME (WID ("picture_frame")),
 				    label);
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label),
@@ -581,10 +581,12 @@ main (int argc, char **argv)
 		setup_dialog (dialog, NULL, set);
 
 		dialog_win = gtk_dialog_new_with_buttons
-			(_("Background Preferences"), NULL, -1,
+			(_("Background Preferences"), NULL, 0,
 			 GTK_STOCK_HELP, GTK_RESPONSE_HELP,
 			 GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
 			 NULL);
+		gtk_dialog_set_default_response (GTK_DIALOG (dialog_win),
+			GTK_RESPONSE_CLOSE);
 
 		pixbuf = gdk_pixbuf_new_from_file (GNOMECC_DATA_DIR "/icons/background-capplet.png", NULL);
 		gtk_window_set_icon (GTK_WINDOW(dialog_win), pixbuf);
diff --git a/capplets/background/background-properties.glade b/capplets/background/background-properties.glade
index 3476118fc..fb713fa73 100644
--- a/capplets/background/background-properties.glade
+++ b/capplets/background/background-properties.glade
@@ -251,7 +251,7 @@ background picture.</property>
 	      <child>
 		<widget class="GtkLabel" id="border_shading_label">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Bor_der the picture with a:</property>
+		  <property name="label" translatable="yes">Picture bor_der:</property>
 		  <property name="use_underline">True</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>