diff --git a/server/views/pages/establishmentRoll.njk b/server/views/pages/establishmentRoll.njk
index 47a071a..add38ae 100644
--- a/server/views/pages/establishmentRoll.njk
+++ b/server/views/pages/establishmentRoll.njk
@@ -168,3 +168,7 @@
     </table>
 </div>
 {% endblock %}
+
+{% block pageScripts %}
+    <script src="/assets/establishment-roll.js"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/server/views/pages/index.njk b/server/views/pages/index.njk
index 6df5a49..e95975e 100644
--- a/server/views/pages/index.njk
+++ b/server/views/pages/index.njk
@@ -29,3 +29,8 @@
   </div>
 
 {% endblock %}
+
+{% block pageScripts %}
+  <script src="/assets/js/homepage-search.js"></script>
+{% endblock %}
+
diff --git a/server/views/partials/homepage/search.njk b/server/views/partials/homepage/search.njk
index 346736e..4b7fac9 100644
--- a/server/views/partials/homepage/search.njk
+++ b/server/views/partials/homepage/search.njk
@@ -72,7 +72,3 @@
         </form>
     </div>
 </section>
-
-{% block pageScripts %}
-    <script src="/assets/js/homepage-search.js"></script>
-{% endblock %}
diff --git a/server/views/partials/layout.njk b/server/views/partials/layout.njk
index 5a6dde8..98e3183 100644
--- a/server/views/partials/layout.njk
+++ b/server/views/partials/layout.njk
@@ -81,7 +81,9 @@
   <script type="module" src="/assets/govukFrontendInit.js"></script>
   <script src="/assets/moj/all.js"></script>
   <script src="/assets/printPage.js"></script>
-  <script src="/assets/establishment-roll.js"></script>
+
+  {% block pageScripts %}
+  {% endblock %}
 {% endblock %}
 
 {% block footer %}