diff --git a/modules/field_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc
index 5c6f529..a355c7d 100644
--- a/modules/field_ui/field_ui.admin.inc
+++ b/modules/field_ui/field_ui.admin.inc
@@ -397,10 +397,8 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle
       ),
     );
 
-    if (!empty($instance['locked'])) {
-      $table[$name]['edit'] = array('#value' => t('Locked'));
+    if (!empty($field['locked'])) {
       $table[$name]['delete'] = array();
-      $table[$name]['#attributes']['class'][] = 'menu-disabled';
     }
   }
 
@@ -1808,13 +1806,6 @@ function field_ui_field_edit_form($form, &$form_state, $instance) {
   $form['#field'] = $field;
   $form['#instance'] = $instance;
 
-  if (!empty($field['locked'])) {
-    $form['locked'] = array(
-      '#markup' => t('The field %field is locked and cannot be edited.', array('%field' => $instance['label'])),
-    );
-    return $form;
-  }
-
   $field_type = field_info_field_types($field['type']);
   $widget_type = field_info_widget_types($instance['widget']['type']);
   $bundles = field_info_bundles();
diff --git a/modules/field_ui/field_ui.test b/modules/field_ui/field_ui.test
index 21767d6..89232c1 100644
--- a/modules/field_ui/field_ui.test
+++ b/modules/field_ui/field_ui.test
@@ -445,6 +445,30 @@ class FieldUIManageFieldsTestCase extends FieldUITestCase {
     $this->assertText(t('The machine-readable name is already in use. It must be unique.'));
     $this->assertUrl($url, array(), 'Stayed on the same page.');
   }
+
+  /**
+   * Tests that locked field settings could be changed.
+   */
+  function testLockedFieldSettings() {
+    // Create a test field and instance.
+    $field_name = 'test';
+    $field = array(
+      'field_name' => $field_name,
+      'type' => 'test_field',
+      'locked' => TRUE,
+    );
+    field_create_field($field);
+    $instance = array(
+      'field_name' => $field_name,
+      'entity_type' => 'node',
+      'bundle' => $this->type,
+    );
+    field_create_instance($instance);
+    $url = 'admin/structure/types/manage/' . $this->hyphen_type . '/fields/test';
+    $this->drupalGet($url);
+    $this->assertNoText(t('The field %field is locked and cannot be edited.', array('%field' => $field_name)));
+    $this->assertText(t('These settings apply only to the @field field when used in the @bundle type.', array('@field' => $field_name, '@bundle' => $this->type)));
+  }
 }
 
 /**