diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog
index b6a832015..5ff8fc0e0 100644
--- a/gnome-settings-daemon/ChangeLog
+++ b/gnome-settings-daemon/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-10  Jody Goldberg <jody@gnome.org>
+
+	* gnome-settings-accessibility-keyboard.c (set_server_from_gconf) :
+	  add some bounds checking.
+
 2002-06-06  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* gnome-settings-keybindings.c: Make the last string consistent
diff --git a/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c b/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c
index 863b65430..ce54e03ac 100644
--- a/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c
+++ b/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c
@@ -219,6 +219,9 @@ set_server_from_gconf (GConfEntry *ignored)
 			desc->ctrls->ax_options, XkbAX_SKRejectFBMask);
 		desc->ctrls->slow_keys_delay = get_int (client,
 			CONFIG_ROOT "/slowkeys_delay");
+		/* anything larger than 500 seems to loose all keyboard input */
+		if (desc->ctrls->slow_keys_delay > 500)
+			desc->ctrls->slow_keys_delay = 500;
 	}
 
 	/* sticky keys */