diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl
index 9b12de3e0b3e..f5ffd25a19de 100644
--- a/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/templates/CRM/Contribute/Form/Contribution.tpl
@@ -345,25 +345,17 @@
     <div id="customData" class="crm-contribution-form-block-customData"></div>
   {/if}
 
-  {*include custom data js file*}
-  {include file="CRM/common/customData.tpl"}
+  {include file="CRM/Custom/Form/Edit.tpl"}
 
-    {literal}
-    <script type="text/javascript">
-      CRM.$(function($) {
+  {literal}
+  <script type="text/javascript">
+    CRM.$(function($) {
     {/literal}
-    CRM.buildCustomData( '{$customDataType}' );
-    {if $customDataSubType}
-      CRM.buildCustomData( '{$customDataType}', {$customDataSubType} );
-    {/if}
-
-    {if $buildPriceSet}{literal}buildAmount( );{/literal}{/if}
+      {if $buildPriceSet}{literal}buildAmount();{/literal}{/if}
     {literal}
-    });
 
     // bind first click of accordion header to load crm-accordion-body with snippet
     // everything else taken care of by cj().crm-accordions()
-    CRM.$(function($) {
       cj('#adjust-option-type').hide();
       cj('.crm-ajax-accordion .crm-accordion-header').one('click', function() {
         loadPanes(cj(this).attr('id'));
diff --git a/templates/CRM/Custom/Form/Edit.tpl b/templates/CRM/Custom/Form/Edit.tpl
new file mode 100644
index 000000000000..84e41a4a3c40
--- /dev/null
+++ b/templates/CRM/Custom/Form/Edit.tpl
@@ -0,0 +1,16 @@
+{* Edit custom data on Edit entity forms *}
+{* Requires <div id="customData"></div> on the form *}
+{*include custom data js file*}
+{include file="CRM/common/customData.tpl"}
+{literal}
+<script type="text/javascript">
+  CRM.$(function($) {
+    {/literal}
+    CRM.buildCustomData( '{$customDataType}' );
+    {if $customDataSubType}
+    CRM.buildCustomData( '{$customDataType}', {$customDataSubType} );
+    {/if}
+    {literal}
+  });
+</script>
+{/literal}
\ No newline at end of file