diff --git a/panels/keyboard/cc-keyboard-shortcut-dialog.c b/panels/keyboard/cc-keyboard-shortcut-dialog.c
index 0814ead4fa0136e4edd0aa158f77f2ae59cc24a8..db214dca9bba04383530ed95953e3c6ec7be830d 100644
--- a/panels/keyboard/cc-keyboard-shortcut-dialog.c
+++ b/panels/keyboard/cc-keyboard-shortcut-dialog.c
@@ -234,7 +234,7 @@ remove_item (CcKeyboardShortcutDialog *self,
 
       row_data = g_object_get_data (l->data, "data");
 
-      if (row_data->item == item)
+      if (row_data && row_data->item == item)
         {
           if (strcmp (row_data->section_id, "custom") == 0)
             {
@@ -403,6 +403,9 @@ reset_all_shortcuts_cb (GtkWidget *widget,
 
   self = user_data;
 
+  if (widget == GTK_WIDGET (self->custom_shortcut_add_row))
+    return;
+
   data = g_object_get_data (G_OBJECT (widget), "data");
 
   /* Don't reset custom shortcuts */