diff --git a/core/includes/form.inc b/core/includes/form.inc
index 2c67faf..7073a2f 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -3661,18 +3661,18 @@ function form_process_table($element, &$form_state) {
  *   The current state of the form.
  */
 function form_validate_table($element, &$form_state) {
-  $error = FALSE;
+  // Skip this validation if the button to submit the form does not require
+  // selected table row data.
+  if (empty($form_state['triggering_element']['#tableselect'])) {
+    return;
+  }
   if ($element['#multiple']) {
     if (!is_array($element['#value']) || !count(array_filter($element['#value']))) {
-      $error = TRUE;
+      form_error($element, t('No items selected.'));
     }
   }
   elseif (!isset($element['#value']) || $element['#value'] === '') {
-    $error = TRUE;
-  }
-  // @todo Add dependency on #required?
-  if ($error) {
-    form_error($element, t('No items selected.'));
+    form_error($element, t('No item selected.'));
   }
 }
 
diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc
index 7007c6c..39f7700 100644
--- a/core/modules/node/node.admin.inc
+++ b/core/modules/node/node.admin.inc
@@ -452,6 +452,7 @@ function node_admin_nodes() {
   $form['options']['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Update'),
+    '#tableselect' => TRUE,
     '#submit' => array('node_admin_nodes_submit'),
   );