diff --git a/ChangeLog b/ChangeLog
index 7c2dd6689e..ded80d4fc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-11  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c (shortcuts_drag_motion_cb): Oops,
+	initialize "action" before jumping.  Fixes #136900.
+
 2004-03-11  Mark McLoughlin  <mark@skynet.ie>
 
 	* gtk/gtksettings.c: (apply_queued_setting): don't overwrite
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7c2dd6689e..ded80d4fc2 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-03-11  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c (shortcuts_drag_motion_cb): Oops,
+	initialize "action" before jumping.  Fixes #136900.
+
 2004-03-11  Mark McLoughlin  <mark@skynet.ie>
 
 	* gtk/gtksettings.c: (apply_queued_setting): don't overwrite
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7c2dd6689e..ded80d4fc2 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2004-03-11  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c (shortcuts_drag_motion_cb): Oops,
+	initialize "action" before jumping.  Fixes #136900.
+
 2004-03-11  Mark McLoughlin  <mark@skynet.ie>
 
 	* gtk/gtksettings.c: (apply_queued_setting): don't overwrite
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7c2dd6689e..ded80d4fc2 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-03-11  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c (shortcuts_drag_motion_cb): Oops,
+	initialize "action" before jumping.  Fixes #136900.
+
 2004-03-11  Mark McLoughlin  <mark@skynet.ie>
 
 	* gtk/gtksettings.c: (apply_queued_setting): don't overwrite
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7c2dd6689e..ded80d4fc2 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-03-11  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c (shortcuts_drag_motion_cb): Oops,
+	initialize "action" before jumping.  Fixes #136900.
+
 2004-03-11  Mark McLoughlin  <mark@skynet.ie>
 
 	* gtk/gtksettings.c: (apply_queued_setting): don't overwrite
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index dbb556839d..72ce62c548 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -2103,8 +2103,8 @@ shortcuts_drag_motion_cb (GtkWidget             *widget,
     action = GDK_ACTION_MOVE;
   else
     {
-      goto out;
       action = 0;
+      goto out;
     }
 
   shortcuts_compute_drop_position (impl, x, y, &path, &pos);