Index: views_bulk_operations.module
===================================================================
--- views_bulk_operations.module	(revision 3202)
+++ views_bulk_operations.module	(working copy)
@@ -475,46 +475,49 @@
   
   switch ($step) {
     case VIEWS_BULK_OPS_STEP_VIEW:
-      $form['select'] = array(
-        '#type' => 'fieldset',
-        '#title' => t('Bulk operations'),
-        '#prefix' => '<div id="views-bulk-operations-select">',
-        '#suffix' => '</div>',             
-      );
-      $form['objects'] = array(
-        '#type' => 'views_node_selector',
-        '#view' => $plugin->view,
-        '#sets' => $plugin->sets,
-        '#default_value' => $default_objects,
-        '#prefix' => '<div class="views-node-selector">',
-        '#suffix' => '</div>',
-      );
-      if ($plugin->options['display_type'] == 0) {
-        // Create dropdown and submit button.
-        $form['select']['operation'] = array(
-          '#type' => 'select',
-          '#options' => array(0 => t('- Choose an operation -')) + $plugin->get_selected_operations(),
-          '#default_value' => $default_operation,
-          '#prefix' => '<div id="views-bulk-operations-dropdown">',
+      // hide operations select when no operation available        
+      if (count($plugin->get_selected_operations()) > 0) {
+        $form['select'] = array(
+          '#type' => 'fieldset',
+          '#title' => t('Bulk operations'),
+          '#prefix' => '<div id="views-bulk-operations-select">',
           '#suffix' => '</div>',             
         );
-        $form['select']['submit'] = array(
-          '#type' => 'submit',
-          '#value' => t('Execute'),
-          '#prefix' => '<div id="views-bulk-operations-submit">',
-          '#suffix' => '</div>',             
-        );
-      }
-      else {
-        // Create buttons for actions.
-        foreach ($plugin->get_selected_operations() as $md5 => $description) {
-          $form['select'][$md5] = array(
+        if ($plugin->options['display_type'] == 0) {
+          // Create dropdown and submit button.
+          $form['select']['operation'] = array(
+            '#type' => 'select',
+            '#options' => array(0 => t('- Choose an operation -')) + $plugin->get_selected_operations(),
+            '#default_value' => $default_operation,
+            '#prefix' => '<div id="views-bulk-operations-dropdown">',
+            '#suffix' => '</div>',             
+          );
+          $form['select']['submit'] = array(
             '#type' => 'submit',
-            '#value' => $description,
-            '#hash' => $md5,
+            '#value' => t('Execute'),
+            '#prefix' => '<div id="views-bulk-operations-submit">',
+            '#suffix' => '</div>',             
           );
         }
+        else {
+          // Create buttons for actions.
+          foreach ($plugin->get_selected_operations() as $md5 => $description) {
+            $form['select'][$md5] = array(
+              '#type' => 'submit',
+              '#value' => $description,
+              '#hash' => $md5,
+            );
+          }
+        }
       }
+      $form['objects'] = array(
+        '#type' => 'views_node_selector',
+        '#view' => $plugin->view,
+        '#sets' => $plugin->sets,
+        '#value' => $default_objects,
+        '#prefix' => '<div class="views-node-selector">',
+        '#suffix' => '</div>',
+      );      
       break;
   
     case VIEWS_BULK_OPS_STEP_SINGLE:
@@ -524,6 +527,12 @@
       if ($operation['configurable']) {
         $form += _views_bulk_operations_action_form($operation, $plugin->view, $plugin->view->result, $plugin->get_operation_settings($operation));
       }
+      $form['submit'] = array(
+        '#type' => 'submit',
+        '#value' => $operation['label'],
+        '#prefix' => '<div id="views-bulk-operations-submit">',
+        '#suffix' => '</div>',             
+      );
       $form['objects'] = array(
         '#type' => 'views_node_selector',
         '#view' => $plugin->view,
@@ -532,12 +541,7 @@
         '#prefix' => '<div class="views-node-selector">',
         '#suffix' => '</div>',
       );
-      $form['submit'] = array(
-        '#type' => 'submit',
-        '#value' => $operation['label'],
-        '#prefix' => '<div id="views-bulk-operations-submit">',
-        '#suffix' => '</div>',             
-      );
+      
       break;
     
     case VIEWS_BULK_OPS_STEP_CONFIG: