diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog
index 0e6b1c73a..37ca03e0f 100644
--- a/capplets/mouse/ChangeLog
+++ b/capplets/mouse/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-31  Rodrigo Moya <rodrigo@novell.com>
+
+	* gnome-mouse-properties.c (delay_value_changed_cb): guard against
+	invalid values from the GtkHScale widget.
+
 2005-08-30  Sven Herzberg  <herzi@gnome-de.org>
 
 	* gnome-mouse-properties.c: listen to the XCURSOR_PATH environment
diff --git a/capplets/mouse/gnome-mouse-properties.c b/capplets/mouse/gnome-mouse-properties.c
index 5871abf14..f7a22b9ae 100644
--- a/capplets/mouse/gnome-mouse-properties.c
+++ b/capplets/mouse/gnome-mouse-properties.c
@@ -128,7 +128,14 @@ static gboolean
 delay_value_changed_cb (GtkWidget *range, GtkScrollType scroll, gdouble value,
 			gpointer   dialog)
 {
-	gchar *message = g_strdup_printf ("%.1f %s", value / 1000.0, _("seconds"));
+	gchar *message;
+
+	if (value < 100)
+		value = 100;
+	else if (value > 1000)
+		value = 1000;
+
+	message = g_strdup_printf ("%.1f %s", value / 1000.0, _("seconds"));
 	gtk_label_set_label ((GtkLabel*) WID ("delay_label"), message);
 	g_free (message);