diff --git a/includes/webform.components.inc b/includes/webform.components.inc
index 4dafc3e..1679f1a 100644
--- a/includes/webform.components.inc
+++ b/includes/webform.components.inc
@@ -82,7 +82,7 @@ function webform_components_form($form, $form_state, $node) {
 
   $form['add']['name'] = array(
     '#type' => 'textfield',
-    '#size' => 24,
+    '#size' => 36,
   );
 
   $form['add']['type'] = array(
@@ -161,7 +161,7 @@ function theme_webform_components_form($variables) {
 
   $node = $form['#node'];
 
-  $header = array(t('Name'), t('Type'), t('Value'), t('Mandatory'), t('Weight'), array('data' => t('Operations'), 'colspan' => 3));
+  $header = array(t('Name'), t('Form key'), t('Type'), t('Value'), t('Mandatory'), t('Weight'), array('data' => t('Operations'), 'colspan' => 3));
   $rows = array();
 
   // Add a row containing form elements for a new item.
@@ -172,7 +172,7 @@ function theme_webform_components_form($variables) {
   $form['add']['pid']['#attributes']['class'] = array('webform-pid');
   $form['add']['weight']['#attributes']['class'] = array('webform-weight');
   $row_data = array(
-    drupal_render($form['add']['name']),
+    array('colspan' => 2, 'data' => drupal_render($form['add']['name'])),
     drupal_render($form['add']['type']),
     '',
     drupal_render($form['add']['mandatory']),
@@ -215,6 +215,7 @@ function theme_webform_components_form($variables) {
       // Add each component to a table row.
       $row_data = array(
         $indents . filter_xss($component['name']),
+        filter_xss($component['form_key']),
         t($component['type']),
         ($component['value'] == '') ? '-' : $component['value'],
         drupal_render($form['components'][$cid]['mandatory']),