diff --git a/core/modules/field_ui/field_ui.admin.inc b/core/modules/field_ui/field_ui.admin.inc
index 5871be0..2431244 100644
--- a/core/modules/field_ui/field_ui.admin.inc
+++ b/core/modules/field_ui/field_ui.admin.inc
@@ -1604,21 +1604,20 @@
   // Add settings provided by the field module. The field module is
   // responsible for not returning settings that cannot be changed if
   // the field already has data.
-  $form['field']['settings'] = array();
   $additions = module_invoke($field['module'], 'field_settings_form', $field, $instance, $has_data);
-  if (is_array($additions)) {
+  if (is_array($additions) && !empty($additions)) {
     $form['field']['settings'] = $additions;
+    $form_submit = t('Save field settings');
   }
-  if (empty($form['field']['settings'])) {
-    $form['field']['settings'] = array(
-      '#markup' => t('%field has no field settings.', array('%field' => $instance['label'])),
-    );
+  else {
+    $form['field']['#description'] = t('There are no editable field settings for field %field.', array('%field' => $instance['label']));
+    $form_submit = t('Skip field settings');
   }
   $form['#entity_type'] = $entity_type;
   $form['#bundle'] = $bundle;
 
   $form['actions'] = array('#type' => 'actions');
-  $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save field settings'));
+  $form['actions']['submit'] = array('#type' => 'submit', '#value' => $form_submit);
   return $form;
 }
