diff --git a/ChangeLog b/ChangeLog
index 31163a1..a3d30a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-27  Glynn Foster  <glynn.foster@sun.com>
+
+	* src/tree.c:  Put horizontal scrolling on automatic, otherwise
+	we expand off the edge of the screen.
+
 2003-08-25  Mike Newman  <mikegtn@gnome.org>
 
 	* src/entry.c: s/g_printerr/g_print/ - last part of Kevin's patch
diff --git a/src/tree.c b/src/tree.c
index 73e9565..aaf513c 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -160,7 +160,7 @@ zenity_tree_handle_stdin (GIOChannel  *channel,
       scrolled_window = glade_xml_get_widget (glade_dialog, "zenity_tree_window");
       gtk_widget_set_size_request (scrolled_window, -1, rectangle.height);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-                                      GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+                                      GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
     }
 
     column_count ++;
@@ -235,7 +235,7 @@ zenity_tree_fill_entries (GtkTreeView  *tree_view,
       scrolled_window = glade_xml_get_widget (glade_dialog, "zenity_tree_window");
       gtk_widget_set_size_request (scrolled_window, -1, rectangle.height);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-                                      GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+                                      GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
     }
 
   i += n_columns;