diff --git a/ChangeLog b/ChangeLog
index 47328376c7..2ad7db22e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Apr 28 00:16:31 1998  Tim Janik  <timj@gtk.org>
+
+	* app/channels_dialog.c (channels_dialog_create): adjust the scrolled
+	window to always show the currently focused channel item.
+
+	* app/layers_dialog.c (layers_dialog_create): adjust the scrolled
+	window to always show the currently focused layer item.
+
 Mon Apr 27 23:29:10 MEST 1998 Sven Neumann <sven@gimp.org>
 
 	* updated despeckle and sharpen plug-ins
diff --git a/app/channels_dialog.c b/app/channels_dialog.c
index 76cf9d840d..b557b01fda 100644
--- a/app/channels_dialog.c
+++ b/app/channels_dialog.c
@@ -227,7 +227,10 @@ channels_dialog_create ()
       gtk_signal_connect (GTK_OBJECT (channelsD->channel_list), "event",
 			  (GtkSignalFunc) channel_list_events,
 			  channelsD);
-
+      gtk_container_set_focus_vadjustment (GTK_CONTAINER (channelsD->channel_list),
+					   gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (listbox)));
+      GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (listbox)->vscrollbar, GTK_CAN_FOCUS);
+      
       gtk_widget_show (channelsD->channel_list);
       gtk_widget_show (listbox);
 
diff --git a/app/gui/channels-dialog.c b/app/gui/channels-dialog.c
index 76cf9d840d..b557b01fda 100644
--- a/app/gui/channels-dialog.c
+++ b/app/gui/channels-dialog.c
@@ -227,7 +227,10 @@ channels_dialog_create ()
       gtk_signal_connect (GTK_OBJECT (channelsD->channel_list), "event",
 			  (GtkSignalFunc) channel_list_events,
 			  channelsD);
-
+      gtk_container_set_focus_vadjustment (GTK_CONTAINER (channelsD->channel_list),
+					   gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (listbox)));
+      GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (listbox)->vscrollbar, GTK_CAN_FOCUS);
+      
       gtk_widget_show (channelsD->channel_list);
       gtk_widget_show (listbox);
 
diff --git a/app/gui/layers-dialog.c b/app/gui/layers-dialog.c
index 8ede5b08f8..b4b1360f88 100644
--- a/app/gui/layers-dialog.c
+++ b/app/gui/layers-dialog.c
@@ -699,7 +699,10 @@ layers_dialog_create ()
       gtk_signal_connect (GTK_OBJECT (layersD->layer_list), "event",
 			  (GtkSignalFunc) layer_list_events,
 			  layersD);
-
+      gtk_container_set_focus_vadjustment (GTK_CONTAINER (layersD->layer_list),
+					   gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (listbox)));
+      GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (listbox)->vscrollbar, GTK_CAN_FOCUS);
+      
       gtk_widget_show (layersD->layer_list);
       gtk_widget_show (listbox);
 
diff --git a/app/layers_dialog.c b/app/layers_dialog.c
index 8ede5b08f8..b4b1360f88 100644
--- a/app/layers_dialog.c
+++ b/app/layers_dialog.c
@@ -699,7 +699,10 @@ layers_dialog_create ()
       gtk_signal_connect (GTK_OBJECT (layersD->layer_list), "event",
 			  (GtkSignalFunc) layer_list_events,
 			  layersD);
-
+      gtk_container_set_focus_vadjustment (GTK_CONTAINER (layersD->layer_list),
+					   gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (listbox)));
+      GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (listbox)->vscrollbar, GTK_CAN_FOCUS);
+      
       gtk_widget_show (layersD->layer_list);
       gtk_widget_show (listbox);