diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index beaadd233..598c27af6 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -3,6 +3,7 @@
  - fixed: Rich editor image uploader doesn't follow size limits
  - make sure all tables are using UTF-8
  - fixed: Poll question/answers with international text corrupted
+ - fixed: Thingy: on demo sites the edit and delete icons in search results have wrong url's
  - upgraded to TinyMCE 3
 
 7.5.8
diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm
index ef951d904..c47506e42 100644
--- a/lib/WebGUI/Asset/Wobject/Thingy.pm
+++ b/lib/WebGUI/Asset/Wobject/Thingy.pm
@@ -2314,9 +2314,9 @@ sequenceNumber');
             );
             if ($self->hasPrivileges($thingProperties{groupIdEdit})){
                 $templateVars{searchResult_delete_icon} = $session->icon->delete('func=deleteThingDataConfirm;thingId='
-                .$thingId.';thingDataId='.$thingDataId,$url,$i18n->get('delete thing data warning'));
+                .$thingId.';thingDataId='.$thingDataId,$self->get("url"),$i18n->get('delete thing data warning'));
                 $templateVars{searchResult_edit_icon} = $session->icon->edit('func=editThingData;thingId='
-                .$thingId.';thingDataId='.$thingDataId,$url);
+                .$thingId.';thingDataId='.$thingDataId,$self->get("url"));
             }
             push(@searchResult_loop,\%templateVars);
         }