diff --git a/handlers/views_handler_field.inc b/handlers/views_handler_field.inc
index bf00f93..78308e3 100644
--- a/handlers/views_handler_field.inc
+++ b/handlers/views_handler_field.inc
@@ -371,7 +371,12 @@ class views_handler_field extends views_handler {
         'html' => array('default' => FALSE),
       ),
     );
-    $options['element_type'] = array('default' => '');
+    $options['element_type'] = array(
+      'contains' => array(
+        'element_type_list' => array('default' => ''),
+        'element_type_custom' => array('default' => ''),
+      ),
+    );
     $options['element_class'] = array('default' => '');
 
     $options['element_label_type'] = array('default' => '');
@@ -474,8 +479,7 @@ class views_handler_field extends views_handler {
     );
     $form['element_type'] = array(
       '#title' => t('HTML element'),
-      '#options' => $this->get_elements(),
-      '#type' => 'select',
+      '#type' => 'html_element',
       '#default_value' => $this->options['element_type'],
       '#description' => t('Choose the HTML element to wrap around this field, e.g. H1, H2, etc.'),
       '#dependency' => array(