diff --git a/components/select.inc b/components/select.inc
index def3ef1..ab066e9 100644
--- a/components/select.inc
+++ b/components/select.inc
@@ -275,6 +275,12 @@ function _webform_render_select($component, $value = NULL, $filter = TRUE) {
     '#pre_render' => array(), // Needed to disable double-wrapping of radios and checkboxes.
     '#translatable' => array('title', 'description', 'options'),
   );
+  // The Drupal FAPI does not support inline so we need to move to a
+  // supported value here to be compatible with select_or_other.
+  if ($element['#title_display'] === 'inline') {
+    $element['#title_display'] = 'before';
+    $element['#title_display_inline'] = TRUE;
+  }
 
   // Convert the user-entered options list into an array.
   $default_value = $filter ? _webform_filter_values($component['value'], $node, NULL, NULL, FALSE) : $component['value'];
diff --git a/webform.module b/webform.module
index d4dd99d..1206d08 100644
--- a/webform.module
+++ b/webform.module
@@ -2670,7 +2670,7 @@ function theme_webform_element($variables) {
    'webform-component',
    'webform-component-' . $type,
   );
-  if (isset($element['#title_display']) && strcmp($element['#title_display'], 'inline') === 0) {
+  if (!empty($element['#title_display_inline'])) {
     $wrapper_classes[] = 'webform-container-inline';
   }
   $output = '<div class="' . implode(' ', $wrapper_classes) . '" id="webform-component-' . $parents . '">' . "\n";