diff --git a/panels/keyboard/gnome-keyboard-panel.ui b/panels/keyboard/gnome-keyboard-panel.ui
index 8a43fc3fd..2a35c0461 100644
--- a/panels/keyboard/gnome-keyboard-panel.ui
+++ b/panels/keyboard/gnome-keyboard-panel.ui
@@ -275,7 +275,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkTable" id="table100">
+                              <object class="GtkTable" id="repeat_table">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="n_rows">2</property>
@@ -511,7 +511,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkTable" id="table30">
+                              <object class="GtkTable" id="cursor_table">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="n_columns">4</property>
diff --git a/panels/keyboard/keyboard-general.c b/panels/keyboard/keyboard-general.c
index dd4c0a399..1cef54244 100644
--- a/panels/keyboard/keyboard-general.c
+++ b/panels/keyboard/keyboard-general.c
@@ -59,6 +59,10 @@ keyboard_general_init (CcPanel *panel, GtkBuilder *builder)
   g_settings_bind (keyboard_settings, "repeat",
                    gtk_builder_get_object (builder, "repeat_toggle"), "active",
                    G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (keyboard_settings, "repeat",
+                   gtk_builder_get_object (builder, "repeat_table"), "sensitive",
+                   G_SETTINGS_BIND_GET);
+  
   g_settings_bind (keyboard_settings, "delay",
                    gtk_range_get_adjustment (GTK_RANGE (gtk_builder_get_object (builder, "repeat_delay_scale"))), "value",
                    G_SETTINGS_BIND_DEFAULT);
@@ -70,6 +74,10 @@ keyboard_general_init (CcPanel *panel, GtkBuilder *builder)
   g_settings_bind (interface_settings, "cursor-blink",
                    gtk_builder_get_object (builder, "cursor_toggle"), "active",
                    G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (interface_settings, "cursor-blink",
+                   gtk_builder_get_object (builder, "cursor_table"), "sensitive",
+                   G_SETTINGS_BIND_GET);
+
   g_settings_bind (interface_settings, "cursor-blink-time",
                    gtk_range_get_adjustment (GTK_RANGE (gtk_builder_get_object (builder, "cursor_blink_time_scale"))), "value",
                    G_SETTINGS_BIND_DEFAULT);