diff --git a/opentech/apply/funds/templates/funds/application_base.html b/opentech/apply/funds/templates/funds/application_base.html
index 0ac5533c96f78b7332c0d3a44a06a9b740237d3e..a82e3844f287e327d73fa01d0c8847dc87124434 100644
--- a/opentech/apply/funds/templates/funds/application_base.html
+++ b/opentech/apply/funds/templates/funds/application_base.html
@@ -26,7 +26,6 @@
         {# the page has no open rounds and we arent on a round page #}
         <h3>{% blocktrans %}Sorry this {{ page|verbose_name }} is not accepting applications at the moment{% endblocktrans %}</h3>
     {% else%}
-        <p class="wrapper--error message-no-js js-hidden">You must have Javascript enabled to use this form.</p>
         <form class="form application-form" action="/test500/" method="POST" enctype="multipart/form-data">
             {{ form.media }}
             {% csrf_token %}
@@ -46,6 +45,7 @@
             {% endfor %}
             <button class="link link--button-secondary" type="submit" disabled>{% if page.action_text %}{{ page.action_text|safe }}{% else %}Submit for review{% endif %}</button>
         </form>
+        <p class="wrapper--error message-no-js js-hidden">You must have Javascript enabled to use this form.</p>
     {% endif %}
 </div>
 {% endblock %}
diff --git a/opentech/public/forms/templates/public_forms/form_page.html b/opentech/public/forms/templates/public_forms/form_page.html
index dfe28f87e84cffdd75334cf5e451e157f56c819e..daca59a09842c5ed186fe1828ca6decdd8cc591e 100644
--- a/opentech/public/forms/templates/public_forms/form_page.html
+++ b/opentech/public/forms/templates/public_forms/form_page.html
@@ -5,7 +5,6 @@
 <div class="wrapper wrapper--medium wrapper--light-grey-bg wrapper--form">
     <h1>{{ page.title }}</h1>
     {{ page.intro|richtext }}
-    <p class="wrapper--error message-no-js js-hidden">You must have Javascript enabled to use this form.</p>
     <form class="form wagtail-form" action="#" data-actionpath="{% pageurl page %}" method="post" enctype="multipart/form-data">
         {% csrf_token %}
         {{ form.media }}
@@ -18,6 +17,7 @@
         {% endfor %}
         <button class="link link--button-secondary" type="submit" disabled>Submit</button>
     </form>
+    <p class="wrapper--error message-no-js js-hidden">You must have Javascript enabled to use this form.</p>
 </div>
 {% endblock %}