diff --git a/ChangeLog b/ChangeLog
index 40c7d6eada..a99b0fa85c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-05  Federico Mena Quintero  <federico@ximian.com>
+
+	Fix #161409:
+
+	* gtk/gtkfilechooserdefault.c (shortcuts_row_activated_cb): Queue
+	a pending operation to select the first row.
+
 2005-01-05  Federico Mena Quintero  <federico@ximian.com>
 
 	* gtk/gtkpathbar.c (_gtk_path_bar_set_path): Don't call
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 40c7d6eada..a99b0fa85c 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2005-01-05  Federico Mena Quintero  <federico@ximian.com>
+
+	Fix #161409:
+
+	* gtk/gtkfilechooserdefault.c (shortcuts_row_activated_cb): Queue
+	a pending operation to select the first row.
+
 2005-01-05  Federico Mena Quintero  <federico@ximian.com>
 
 	* gtk/gtkpathbar.c (_gtk_path_bar_set_path): Don't call
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 40c7d6eada..a99b0fa85c 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2005-01-05  Federico Mena Quintero  <federico@ximian.com>
+
+	Fix #161409:
+
+	* gtk/gtkfilechooserdefault.c (shortcuts_row_activated_cb): Queue
+	a pending operation to select the first row.
+
 2005-01-05  Federico Mena Quintero  <federico@ximian.com>
 
 	* gtk/gtkpathbar.c (_gtk_path_bar_set_path): Don't call
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 40c7d6eada..a99b0fa85c 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2005-01-05  Federico Mena Quintero  <federico@ximian.com>
+
+	Fix #161409:
+
+	* gtk/gtkfilechooserdefault.c (shortcuts_row_activated_cb): Queue
+	a pending operation to select the first row.
+
 2005-01-05  Federico Mena Quintero  <federico@ximian.com>
 
 	* gtk/gtkpathbar.c (_gtk_path_bar_set_path): Don't call
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 0baca0b123..e4955e779f 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -5561,6 +5561,7 @@ shortcuts_row_activated_cb (GtkTreeView           *tree_view,
 						    &child_iter,
 						    &iter);
   shortcuts_activate_iter (impl, &child_iter);
+  pending_op_queue (impl, PENDING_OP_SELECT_FIRST, NULL);
 
   gtk_widget_grab_focus (impl->browse_files_tree_view);
 }