--- content_admin_orig.inc	2008-02-28 14:05:45.000000000 +0100
+++ content_admin.inc	2008-02-29 23:10:21.000000000 +0100
@@ -149,7 +149,7 @@ function content_admin_field_overview_fo
   // Let drupal_render figure out the right order for the rows.
   $form['#order'] = explode(' ', trim(drupal_render($dummy)));
 
-  $form['submit'] = array('#type' => 'submit', '#value' => t('Save'));
+  $form['submit'] = array('#type' => 'submit', '#value' => t('Save'), '#attributes' => array('class' => 'content-admin-field-overview-submit'));
   return $form;
 }
 
@@ -192,6 +192,10 @@ function theme_content_admin_field_overv
   drupal_add_tabledrag('content-field-overview', 'match', 'parent', 'group-parent', 'group-parent', 'field-name', TRUE, 1);
   drupal_add_tabledrag('content-field-overview', 'order', 'sibling', 'field-weight');
 
+  // Hide the Save button, show it when fields are swapped.
+  drupal_add_js('if (Drupal.jsEnabled) { $(document).ready(function() { $(".content-admin-field-overview-submit").hide(); }); }', 'inline');
+  drupal_add_js(drupal_get_path('module', 'content') .'/content.js');
+
   return $output;
 }
 
