diff --git a/modules/field/views_handler_field_field.inc b/modules/field/views_handler_field_field.inc
index b50a0ae..7ce1fe0 100644
--- a/modules/field/views_handler_field_field.inc
+++ b/modules/field/views_handler_field_field.inc
@@ -390,6 +390,10 @@ class views_handler_field_field extends views_handler_field {
     $options['separator'] = array(
       'default' => ', '
     );
+    $options['list_single'] = array(
+      'default' => TRUE,
+      'bool' => TRUE,
+    );
 
     $options['field_api_classes'] = array(
       'default' => FALSE,
@@ -540,6 +544,19 @@ class views_handler_field_field extends views_handler_field {
       '#fieldset' => 'multiple_field_settings',
     );
 
+    $form['list_single'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Create list for single items'),
+      '#description' => t('Uncheck this to disable HTML lists for fields with only one item.'),
+      '#default_value' => $this->options['list_single'],
+      '#dependency' => array(
+        'radio:options[multi_type]' => array('ul', 'ol'),
+        'edit-options-group-rows' => array(TRUE),
+      ),
+      '#dependency_count' => 2,
+      '#fieldset' => 'multiple_field_settings',
+    );
+
     $form['delta_limit'] = array(
       '#type' => $type,
       '#size' => $size,
@@ -700,6 +717,9 @@ class views_handler_field_field extends views_handler_field {
       if ($this->options['multi_type'] == 'separator') {
         return implode(filter_xss_admin($this->options['separator']), $items);
       }
+      elseif (!$this->options['list_single'] and count($items) == 1) {
+        return array_pop($items);
+      }
       else {
         return theme('item_list',
           array(