diff --git a/ChangeLog b/ChangeLog
index 378ce64530..6bb9215bc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-09-19  Andreas Köhler  <andi5.py@gmx.net>
 
+	* $some.glade: Use some more automatic scrollbars.
+
 	* src/backend/file/gnc-backend-file.c:
 	* src/gnome-utils/gnc-file.c: Do not complain about non-existent
 	  files if we save to a new file. In pass one we ignore the error
diff --git a/src/gnome-search/search.glade b/src/gnome-search/search.glade
index 1093f6a023..9cc1ea1773 100644
--- a/src/gnome-search/search.glade
+++ b/src/gnome-search/search.glade
@@ -330,7 +330,7 @@
 		    <widget class="GtkScrolledWindow" id="scrolledwindow1">
 		      <property name="visible">True</property>
 		      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-		      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 		      <property name="shadow_type">GTK_SHADOW_NONE</property>
 		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
diff --git a/src/gnome/glade/account.glade b/src/gnome/glade/account.glade
index 3bba274dae..1f912f760d 100644
--- a/src/gnome/glade/account.glade
+++ b/src/gnome/glade/account.glade
@@ -887,7 +887,7 @@
 			  <property name="visible">True</property>
 			  <property name="sensitive">False</property>
 			  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-			  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+			  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 			  <property name="shadow_type">GTK_SHADOW_NONE</property>
 			  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
diff --git a/src/gnome/glade/commodities.glade b/src/gnome/glade/commodities.glade
index 7de30d231b..40bdc93b08 100644
--- a/src/gnome/glade/commodities.glade
+++ b/src/gnome/glade/commodities.glade
@@ -220,8 +220,8 @@
 		    <widget class="GtkScrolledWindow" id="commodity_list_window">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-		      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+		      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 		      <property name="shadow_type">GTK_SHADOW_IN</property>
 		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
diff --git a/src/gnome/glade/price.glade b/src/gnome/glade/price.glade
index 7f0622cdaf..c66735841c 100644
--- a/src/gnome/glade/price.glade
+++ b/src/gnome/glade/price.glade
@@ -60,7 +60,7 @@
 	  <property name="border_width">3</property>
 	  <property name="visible">True</property>
 	  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+	  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 	  <property name="shadow_type">GTK_SHADOW_IN</property>
 	  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
diff --git a/src/gnome/glade/stocks.glade b/src/gnome/glade/stocks.glade
index 97aec8d574..01f9ee5f99 100644
--- a/src/gnome/glade/stocks.glade
+++ b/src/gnome/glade/stocks.glade
@@ -81,8 +81,8 @@
 		<widget class="GtkScrolledWindow" id="scrolledwindow22">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-		  <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-		  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 		  <property name="shadow_type">GTK_SHADOW_IN</property>
 		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>