diff --git a/ChangeLog b/ChangeLog
index 47036989a5..f51eb29494 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-22  Martin Nordholts  <martinn@svn.gnome.org>
+
+	* app/tools/gimpfreeselecttool.c
+	(gimp_free_select_tool_cursor_update): Don't return in the middle
+	of the function.
+
 2008-05-21  Martin Nordholts  <martinn@svn.gnome.org>
 
 	* app/tools/gimpforegroundselecttool.c
diff --git a/app/tools/gimpfreeselecttool.c b/app/tools/gimpfreeselecttool.c
index 75ebd91bcb..9232237f3e 100644
--- a/app/tools/gimpfreeselecttool.c
+++ b/app/tools/gimpfreeselecttool.c
@@ -937,10 +937,14 @@ gimp_free_select_tool_cursor_update (GimpTool        *tool,
                             gimp_tool_control_get_tool_cursor (tool->control),
                             GIMP_CURSOR_MODIFIER_MOVE);
 
-      return;
     }
-
-  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
+  else
+    {
+      GIMP_TOOL_CLASS (parent_class)->cursor_update (tool,
+                                                     coords,
+                                                     state,
+                                                     display);
+    }
 }
 
 static void