diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index c27382eff..7ad9cf48f 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -9,6 +9,7 @@
  - fixed #10612: strange i18n, with regard to label
  - fixed #9935: German characters in Collaboration System
  - fixed #10610: editing a page and editing goes away
+ - fixed #10518: ThingyRecord edit page - Fields to Edit not filled in
 
 7.7.13
  - fixed #10574: Creating Calendar Entry
diff --git a/lib/WebGUI/Asset/Sku/ThingyRecord.pm b/lib/WebGUI/Asset/Sku/ThingyRecord.pm
index 3b55be437..74063b865 100644
--- a/lib/WebGUI/Asset/Sku/ThingyRecord.pm
+++ b/lib/WebGUI/Asset/Sku/ThingyRecord.pm
@@ -207,6 +207,11 @@ sub getEditForm {
         $self->session->url->extras('yui-webgui/build/thingyRecord/thingyRecord.js'),
         { type => "text/javascript" },
     );
+    $self->session->style->setRawHeadTags(<<EOSCRIPT);
+<script type="text/javascript">
+YAHOO.util.Event.onDOMReady( function () { var thingForm = YAHOO.util.Dom.get('thingId_formId'); WebGUI.ThingyRecord.getThingFields(thingForm.options[thingForm.selectedIndex].value,'thingFields_formId')} );
+</script>
+EOSCRIPT
     return $self->SUPER::getEditForm;
 }