diff --git a/ChangeLog b/ChangeLog
index f713ff367..9a60bdcd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-22  Thomas Thurman  <tthurman@gnome.org>
+
+	* src/core/prefs.c: fix stupid infinite loop when GConf is turned off.
+
 2008-11-22  Thomas Thurman  <tthurman@gnome.org>
 
 	* src/core/prefs.c: fix two places where there was a warning
diff --git a/src/core/prefs.c b/src/core/prefs.c
index d0fb1c9c6..ca928e9e4 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -1875,8 +1875,10 @@ init_bindings (void)
   int which = 0;
   while (key_string_bindings[i].name)
     {
-      if (key_string_bindings[i].keybinding == NULL)
+      if (key_string_bindings[i].keybinding == NULL) {
+        ++i;
         continue;
+      }
     
       while (strcmp(key_bindings[which].name, 
                     key_string_bindings[i].name) != 0)