diff --git a/ChangeLog b/ChangeLog
index 006163a3fd..1bc00be79f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-02  Martin Nordholts  <martinn@svn.gnome.org>
+
+	* app/tools/gimppolygonselecttool.c
+	(gimp_polygon_select_tool_remove_last): Properly halt the tool
+	when there are no vertices left.
+
 2008-02-02  Martin Nordholts  <martinn@svn.gnome.org>
 
 	* app/tools/gimppolygonselecttool.c
diff --git a/app/tools/gimppolygonselecttool.c b/app/tools/gimppolygonselecttool.c
index c6b1ae3e81..1dbecf478a 100644
--- a/app/tools/gimppolygonselecttool.c
+++ b/app/tools/gimppolygonselecttool.c
@@ -535,14 +535,12 @@ gimp_polygon_select_tool_remove_last (GimpPolygonSelectTool *poly_sel_tool)
 
   gimp_draw_tool_pause (draw_tool);
 
+  poly_sel_tool->num_points--;
+
   if (poly_sel_tool->num_points == 0)
     {
       gimp_polygon_select_tool_halt (poly_sel_tool);
     }
-  else
-    {
-      poly_sel_tool->num_points--;
-    }
 
   gimp_draw_tool_resume (draw_tool);
 }