diff --git a/babybuddy/static_src/js/babybuddy.js b/babybuddy/static_src/js/babybuddy.js
index 732f69c3..cf632df9 100644
--- a/babybuddy/static_src/js/babybuddy.js
+++ b/babybuddy/static_src/js/babybuddy.js
@@ -43,3 +43,19 @@ $("form").off("submit", preventDoubleSubmit);
 $("form").on("submit", function () {
   $(this).on("submit", preventDoubleSubmit);
 });
+
+BabyBuddy.RememberAdvancedToggle = function (ptr) {
+  localStorage.setItem("advancedForm", event.newState);
+};
+
+(function toggleAdvancedFields() {
+  window.addEventListener("load", function () {
+    if (localStorage.getItem("advancedForm") !== "open") {
+      return;
+    }
+
+    document.querySelectorAll(".advanced-fields").forEach(function (node) {
+      node.open = true;
+    });
+  });
+})();
diff --git a/babybuddy/templates/babybuddy/base.html b/babybuddy/templates/babybuddy/base.html
index f785dc2e..bf7a029c 100644
--- a/babybuddy/templates/babybuddy/base.html
+++ b/babybuddy/templates/babybuddy/base.html
@@ -44,22 +44,6 @@
         <script src="{% static "babybuddy/js/vendor.js" %}"></script>
         <script src="{% static "babybuddy/js/app.js" %}"></script>
         {% if user.is_authenticated %}<script>BabyBuddy.PullToRefresh.init()</script>{% endif %}
-        {% block javascript %}
-            <script type="application/javascript">
-                function rememberAdvancedToggle(event, element){
-                    localStorage.setItem("advancedForm",event.newState)
-                }
-
-                window.addEventListener('load', function () {
-                    if(localStorage.getItem("advancedForm") !== "open"){
-                        return;
-                    }
-
-                    document.querySelectorAll("form details").forEach(function(node){
-                        node.open = true
-                    });
-                })
-            </script>
-        {% endblock %}
+        {% block javascript %}{% endblock %}
     </body>
 </html>
diff --git a/core/templates/forms/layouts/advanced.html b/core/templates/forms/layouts/advanced.html
index 51219e0f..d51ea2da 100644
--- a/core/templates/forms/layouts/advanced.html
+++ b/core/templates/forms/layouts/advanced.html
@@ -1,7 +1,8 @@
 {% load i18n %}
 <div class="row">
     <div class="row mb-3">
-        <details ontoggle="rememberAdvancedToggle(event)" class="advanced-fields">
+        <details ontoggle="BabyBuddy.RememberAdvancedToggle(event)"
+                 class="advanced-fields">
             <summary class="advanced-fields__summary">
                 <h4>{% trans "Advanced Fields" %}</h4>
             </summary>