diff --git a/views/views_bulk_operations_handler_field_operations.inc b/views/views_bulk_operations_handler_field_operations.inc
index 1ca0280..b7aa964 100644
--- a/views/views_bulk_operations_handler_field_operations.inc
+++ b/views/views_bulk_operations_handler_field_operations.inc
@@ -59,7 +59,6 @@ class views_bulk_operations_handler_field_operations extends views_handler_field
         'force_single' => array('default' => FALSE),
         'entity_load_capacity' => array('default' => 10),
         'skip_batching' => array('default' => 0),
-        'skip_complete_message' => array('default' => FALSE),
       ),
     );
     $options['vbo_operations'] = array(
@@ -148,12 +147,6 @@ class views_bulk_operations_handler_field_operations extends views_handler_field
       '#default_value' => $this->options['vbo_settings']['skip_batching'],
       '#description' => '<b>' . t('Warning:') . '</b> ' . t('This will cause timeouts for larger amounts of selected items.'),
     );
-    $form['vbo_settings']['skip_complete_message'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Skip complete message'),
-      '#default_value' => $this->options['vbo_settings']['skip_complete_message'],
-      '#description' => t('Suppress the message displayed upon completion of the operation.'),
-    );
 
     // Display operations and their settings.
     $form['vbo_operations'] = array(
@@ -194,6 +187,15 @@ class views_bulk_operations_handler_field_operations extends views_handler_field
         ),
       );
 
+      $form['vbo_operations'][$operation_id]['skip_complete_message'] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Skip complete message'),
+        '#default_value' => !empty($operation_options['skip_confirmation']),
+        '#dependency' => array(
+          $dom_id . '-selected' => array(1),
+        ),
+      );
+
       $form['vbo_operations'][$operation_id] += $operation->adminOptionsForm($dom_id, $this);
     }
   }