diff --git a/modules/webform/form_builder_webform.components.inc b/modules/webform/form_builder_webform.components.inc
index aa00c8d..91f5c13 100644
--- a/modules/webform/form_builder_webform.components.inc
+++ b/modules/webform/form_builder_webform.components.inc
@@ -179,6 +179,7 @@ function _form_builder_webform_form_builder_types_fieldset() {
       'collapsible',
       'collapsed',
       'key',
+      'title_display',
     ),
   );
   $fields['fieldset']['default'] = _form_builder_webform_default('fieldset');
@@ -194,6 +195,7 @@ function _form_builder_webform_form_builder_save_fieldset($component, $form_elem
   $component['extra']['collapsible'] = isset($form_element['#collapsible']) ? $form_element['#collapsible'] : NULL;
   $component['extra']['collapsed'] = isset($form_element['#collapsed']) ? $form_element['#collapsed'] : NULL;
   $component['extra']['description'] = isset($form_element['#description']) ? $form_element['#description'] : '';
+  $component['extra']['title_display'] = isset($form_element['#title_display']) ? $form_element['#title_display'] : 'before';
   return $component;
 }
 
diff --git a/modules/webform/form_builder_webform.module b/modules/webform/form_builder_webform.module
index 54832b1..63cd8d9 100644
--- a/modules/webform/form_builder_webform.module
+++ b/modules/webform/form_builder_webform.module
@@ -426,12 +426,26 @@ function _webform_render_pagebreak_clone($component, $value = NULL, $filter = TR
  * Customizations to the field configuration form to better integrate with webforms.
  */
 function form_builder_webform_form_form_builder_field_configure_alter(&$form, &$form_state, $form_id) {
-  // Change the list of options from the default Drupal values to the acceptable
-  // webform values.
-  $form['title_display']['#options'] = array(
-    'before' => t('Above'),
-    'inline' => t('Inline'),
-    'none' => t('Hidden'),
-  );
-  $form['title_display']['#default_value'] = isset($form['title_display']['#default_value']) ? $form['title_display']['#default_value'] : 'before';
+  // When editing the title display property for a webform, change the list of
+  // options from the default Drupal values to the acceptable webform values.
+  // Only include "inline" if the webform component being edited actually
+  // allows inline titles.
+  if ($form['#_edit_form_type'] == 'webform' && isset($form['title_display'])) {
+    $type = $form['#_edit_element']['#form_builder']['element_type'];
+    module_load_include('inc', 'webform', 'includes/webform.components');
+    if (webform_component_feature($type, 'title_inline')) {
+      $form['title_display']['#options'] = array(
+        'before' => t('Above'),
+        'inline' => t('Inline'),
+        'none' => t('Hidden'),
+      );
+    }
+    else {
+      $form['title_display']['#options'] = array(
+        'before' => t('Above'),
+        'none' => t('Hidden'),
+      );
+    }
+    $form['title_display']['#default_value'] = isset($form['title_display']['#default_value']) ? $form['title_display']['#default_value'] : 'before';
+  }
 }