diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 04336089e..a1fc5bbd5 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -7,6 +7,7 @@
  - fixed #12054: Thingy: Time fields and formatting
  - fixed #12061: TimeField form plugin doesn't work with all names.
  - fixed #12055: Thingy pagination breaks after editing data
+ - fixed #12066: Thingy CSV export overrides ExportHTML
 
 7.10.10
  - fixed #12035: Story Manager - make keywords from Story view work
diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm
index 48c8fc031..0e9041072 100644
--- a/lib/WebGUI/Asset/Wobject/Thingy.pm
+++ b/lib/WebGUI/Asset/Wobject/Thingy.pm
@@ -2727,13 +2727,13 @@ sub www_editThingDataSaveViaAjax {
 
 #-------------------------------------------------------------------
 
-=head2 www_export ( )
+=head2 www_exportThing ( )
 
-Exports search results as csv.
+Exports one entire Thing as CSV.
 
 =cut
 
-sub www_export {
+sub www_exportThing {
     my $self = shift;
     my $session = $self->session;
     my ($query,$sth,$out,$fields,@fields,$fileName,@fieldLabels);
@@ -3322,7 +3322,7 @@ sub getSearchTemplateVars {
     $var->{"thing_label"} = $thingProperties->{label};
 
     if ($self->hasPrivileges($thingProperties->{groupIdExport})){
-        $var->{"export_url"} = $session->url->append($url, 'func=export;thingId='.$thingId);
+        $var->{"export_url"} = $session->url->append($url, 'func=exportThing;thingId='.$thingId);
     }
     if ($self->hasPrivileges($thingProperties->{groupIdImport})){
         $var->{"import_url"} = $session->url->append($url, 'func=importForm;thingId='.$thingId);
diff --git a/lib/WebGUI/i18n/English/Asset_Thingy.pm b/lib/WebGUI/i18n/English/Asset_Thingy.pm
index 0b24cac16..f3461086a 100644
--- a/lib/WebGUI/i18n/English/Asset_Thingy.pm
+++ b/lib/WebGUI/i18n/English/Asset_Thingy.pm
@@ -929,8 +929,7 @@ below/after the form element.|,
     },
 
     'export_url' => {
-        message => q|Url to export the data in a search result into a csv file. This is only available after a
-search has been done.|,
+        message => q|Url to export the all data in a thing into a csv file.|,
         lastUpdated => 1104630516,
         context => q|Description of a tmpl_var for the template help.|,
     },