diff --git a/webform.module b/webform.module
index 7cf6794..e5ad2e7 100644
--- a/webform.module
+++ b/webform.module
@@ -3362,29 +3362,14 @@ function webform_variable_get($variable) {
 
 function theme_webform_token_help($variables) {
   $groups = $variables['groups'];
-
-  $fieldset = array(
-    '#title' => t('Token values'),
-    '#type' => 'fieldset',
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
-    '#attributes' => array('class' => array('collapsible', 'collapsed')),
-  );
-
   $help = '<p>' . t('This field supports dynamic token values. Common values might be [current-user:mail] or [node:title].') . '</p>';
   if (!module_exists('token')) {
     $help .= '<p>' . t('A full listing of tokens may be listed here by installing the <a href="http://drupal.org/project/token">Token module</a>.') . '</p>';
   }
-  $fieldset['help'] = array(
-    '#markup' => $help,
-  );
-
-  $fieldset['token_tree'] = array(
-    '#theme' => 'token_tree',
-    '#token_types' => $groups,
-  );
-
-  return render($fieldset);
+  else {
+    $help .= theme('token_tree', array('token_types' => $groups, 'dialog' => TRUE));
+  }
+  return '<div class="webform-token-help">' . $help . '</div>';
 }
 
 function _webform_safe_name($name) {