diff --git a/templates/edit_data.tmpl b/templates/edit_data.tmpl
index 14d42fbe9f7..11a33ed2627 100644
--- a/templates/edit_data.tmpl
+++ b/templates/edit_data.tmpl
@@ -62,6 +62,12 @@
                   <div style="clear: both"></div>
                 </div>
             #end for
+            <div class="form-row">
+                <input type="submit" name="save" value="Save">
+            </div>
+        </form>
+        <form name="auto_detect" action="$h.url_for( action='edit' )" method="post">
+            <input type="hidden" name="id" value="$data.id">
             <div style="float: left; width: 250px; margin-right: 10px;">
                 <input type="submit" name="detect" value="Auto-detect">
             </div>
@@ -69,14 +75,10 @@
                 This will inspect the dataset and attempt to correct the above column values
                 if they are not accurate.
             </div>
-            <br/>
-            <div class="form-row">
-                <input type="submit" name="save" value="Save">
-            </div>
         </form>
     </div>
     </div>
-    
+
     <p />
     
     #set $converters = $data.get_converter_types()
diff --git a/test/base/twilltestcase.py b/test/base/twilltestcase.py
index 1854b3d3d85..202cf9b7825 100644
--- a/test/base/twilltestcase.py
+++ b/test/base/twilltestcase.py
@@ -233,8 +233,9 @@ class TwillTestCase( unittest.TestCase ):
         self.assertTrue( hid )
         self.visit_page( 'edit?hid=%d' % hid )
         if form == 1: button = "save"           #Edit Attributes form
-        elif form == 2: button = "convert_data" #Convert to new format form
-        elif form == 3: button = "change"       #Change data type form
+        elif form == 2: button = "detect"       #Auto-detect Metadata Attributes
+        elif form == 3: button = "convert_data" #Convert to new format form
+        elif form == 4: button = "change"       #Change data type form
         if kwd:
             self.submit_form(form=form, button=button, **kwd)
 
diff --git a/test/functional/test_metadata_editing.py b/test/functional/test_metadata_editing.py
index 22fb1356cfe..bc80284402e 100644
--- a/test/functional/test_metadata_editing.py
+++ b/test/functional/test_metadata_editing.py
@@ -9,14 +9,17 @@ class TestMetadataEdit( TwillTestCase ):
         self.check_history_for_string('\? bed')
         self.check_metadata_for_string('1.bed uploaded file unspecified (\?) chromCol value="1" selected endCol value="3" is_strandCol value="true" checked', hid=1)
         """test editing attributes"""
-        self.edit_metadata(hid=1, form=1,  name='Testdata', info="Uploaded my file", dbkey='hg16')
-        self.check_metadata_for_string('Testdata bed Uploaded my file hg16 "bed" selected="yes"', hid=1)
+        self.edit_metadata(hid=1, form=1,  name='Testdata', info="Uploaded my file", dbkey='hg16', startCol='6')
+        self.check_metadata_for_string('Testdata bed Uploaded my file hg16 "bed" selected="yes" "startCol" value="6" selected', hid=1)
+        """test Auto-detecting attributes"""
+        self.edit_metadata(hid=1, form=2)
+        self.check_metadata_for_string('Testdata bed Uploaded my file hg16 "bed" selected="yes" "startCol" value="2" selected', hid=1)
         """test converting formats"""
-        self.edit_metadata(hid=1, form=2, target_type='gff')
+        self.edit_metadata(hid=1, form=3, target_type='gff')
         self.check_history_for_string('hg16 Testdata Convert BED to GFF')
         self.check_metadata_for_string('"gff" selected="yes"', hid=1)
         """test changing data type"""
-        self.edit_metadata(hid=1, form=3, datatype='gff3')
+        self.edit_metadata(hid=1, form=4, datatype='gff3')
         self.check_history_for_string('hg16 Testdata Convert BED to GFF format: gff3')
         self.delete_history_item( 1 )
     def test_9999_clean_up( self ):