diff --git a/ChangeLog b/ChangeLog
index ff6b1d3c..4e9d9d97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-31 Bart Hakvoort  <hakvoort@cvs.gnome.org>
+
+	* src/Dialog_Filesystems.cc: at startup closebutton is focused (#308381)
+
 2005-08-31 Bart Hakvoort  <hakvoort@cvs.gnome.org>
 
 	* src/Dialog_Progress.cc: fixed bug with big fonts (#301831)
diff --git a/src/Dialog_Filesystems.cc b/src/Dialog_Filesystems.cc
index 12b77f73..3cc3a5ac 100644
--- a/src/Dialog_Filesystems.cc
+++ b/src/Dialog_Filesystems.cc
@@ -39,7 +39,7 @@ Dialog_Filesystems::Dialog_Filesystems( )
 	this ->get_vbox( ) ->pack_start( treeview_filesystems ) ;
 	
 	this ->add_button( Gtk::Stock::REFRESH, Gtk::RESPONSE_OK );
-	this ->add_button( Gtk::Stock::CLOSE, Gtk::RESPONSE_CLOSE );
+	this ->add_button( Gtk::Stock::CLOSE, Gtk::RESPONSE_CLOSE ) ->grab_focus() ;
 	this ->show_all_children( ) ;
 }