diff --git a/bank/templates/accounts_list.html b/bank/templates/accounts_list.html
index 80c84de3..2c37119c 100644
--- a/bank/templates/accounts_list.html
+++ b/bank/templates/accounts_list.html
@@ -63,7 +63,9 @@ <h3>Transfer DRFT (Ɖ)</h3>
   </form>
 </div>
 </div>
+{% endblock %}
 
+{% block extrajs %}
 <script src="{% static 'js/chosen.jquery.min.js' %}"></script>
 <script src="{% static 'js/jquery.validate.min.js' %}"></script>
 <script>
diff --git a/core/templates/booking_manage.html b/core/templates/booking_manage.html
index f03a07a6..8a68d328 100644
--- a/core/templates/booking_manage.html
+++ b/core/templates/booking_manage.html
@@ -170,11 +170,11 @@ <h3>Bill Details</h3>
 </div>
 {% endif %}
 
-{% include "snippets/manage-page-confirm-dialogs.html" %}
 </div>
 {% endblock %}
 
 {% block extrajs %}
+{% include "snippets/manage-page-confirm-dialogs.html" %}
 <script language="JavaScript">
 
 function UpdateRefundValue(id, val, field_status) {
diff --git a/core/templates/snippets/manage-page-confirm-dialogs.html b/core/templates/snippets/manage-page-confirm-dialogs.html
index ebe495b4..6662622c 100644
--- a/core/templates/snippets/manage-page-confirm-dialogs.html
+++ b/core/templates/snippets/manage-page-confirm-dialogs.html
@@ -51,6 +51,7 @@
     </p>
 </div>
 
+{# FIXME: This must always be included in extrajs block. This really needs refactoring. #}
 <script>
 $("#dialog-warn-charge").dialog({
     autoOpen: false,
diff --git a/core/templates/subscription_manage.html b/core/templates/subscription_manage.html
index 66936dd6..6f2f43fa 100644
--- a/core/templates/subscription_manage.html
+++ b/core/templates/subscription_manage.html
@@ -135,11 +135,11 @@ <h3 class="row-spacer clickable text-muted" onclick="toggleBillCustomize({{bill.
       </div> <!-- end col-md-7 -->
   </div>
 
-  {% include "snippets/manage-page-confirm-dialogs.html" %}
 </div>
 {% endblock %}
 
 {% block extrajs %}
+{% include "snippets/manage-page-confirm-dialogs.html" %}
 <script language="JavaScript">