diff --git a/handlers/views_handler_field.inc b/handlers/views_handler_field.inc
index bf00f93..2a6b8e4 100644
--- a/handlers/views_handler_field.inc
+++ b/handlers/views_handler_field.inc
@@ -474,8 +474,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(