diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog
index 480ad38eb..bc5e31a39 100644
--- a/capplets/background/ChangeLog
+++ b/capplets/background/ChangeLog
@@ -1,3 +1,11 @@
+2005-08-17  Rodney Dawes  <dobey@novell.com>
+
+	* gnome-wp-capplet.c (wallpaper_properties_init): Replace the changing
+	of some GtkDialog defaults through style properties with calls to
+	gtk_widget_ensure_style and gtk_container_set_border_width
+
+	Fixes #313680
+
 2005-08-15  Veerapuram Varadhan <vvaradhan@novell.com>
 
 	* gnome-wp-capplet.c (gnome_wp_props_wp_set):
diff --git a/capplets/background/gnome-wp-capplet.c b/capplets/background/gnome-wp-capplet.c
index b5352edb6..66f445099 100644
--- a/capplets/background/gnome-wp-capplet.c
+++ b/capplets/background/gnome-wp-capplet.c
@@ -919,12 +919,7 @@ static void wallpaper_properties_init (poptContext ctx) {
   gtk_rc_parse_string ("style \"wp-tree-defaults\" {\n"
 		       "  GtkTreeView::horizontal-separator = 6\n"
 		       "} widget_class \"*TreeView*\""
-		       " style \"wp-tree-defaults\"\n\n"
-		       "style \"wp-dialog-defaults\" {\n"
-		       "  GtkDialog::action-area-border = 0\n"
-		       "  GtkDialog::content-area-border = 0\n"
-		       "} widget_class \"*GtkDialog*\""
-		       " style \"wp-dialog-defaults\"");
+		       " style \"wp-tree-defaults\"");
 
   capplet = g_new0 (GnomeWPCapplet, 1);
 
@@ -992,6 +987,8 @@ static void wallpaper_properties_init (poptContext ctx) {
 
   gtk_widget_realize (capplet->window);
 
+  gtk_widget_ensure_style (capplet->window);
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (capplet->window)->vbox), 0);
   gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (capplet->window)->action_area), 12);
 
   /* Drag and Drop Support */