diff --git a/templates/account/comments.html b/templates/account/comments.html
index 95585180..8dff53e4 100644
--- a/templates/account/comments.html
+++ b/templates/account/comments.html
@@ -17,6 +17,9 @@
                 </h3>
             </div>
 
+            <!-- On-the-fly comment editing functions -->
+            <script type="text/javascript" src="/static/js/comment-edit.js"></script>
+
             {% for comment in comments %}
                 {% include "partials/account/comment.html" %}
             {% endfor %}
diff --git a/templates/packages/show.html b/templates/packages/show.html
index fbc9c0ea..25083020 100644
--- a/templates/packages/show.html
+++ b/templates/packages/show.html
@@ -15,6 +15,9 @@
         </div>
     </div>
 
+    <!-- On-the-fly comment editing functions -->
+    <script type="text/javascript" src="/static/js/comment-edit.js"></script>
+
     {% set pkgname = package.Name %}
     {% set pkgbase_id = pkgbase.ID %}
     {% include "partials/packages/comments.html" %}
diff --git a/templates/partials/head.html b/templates/partials/head.html
index 21c79887..8bfde020 100644
--- a/templates/partials/head.html
+++ b/templates/partials/head.html
@@ -15,8 +15,5 @@
     <!-- Include local typeahead -->
     <script type="text/javascript" src="/static/js/typeahead.js"></script>
 
-    <!-- On-the-fly comment editing functions -->
-    <script type="text/javascript" src="/static/js/comment-edit.js"></script>
-
     <title>AUR ({{ language }}) - {{ title | tr }}</title>
 </head>
diff --git a/templates/pkgbase.html b/templates/pkgbase.html
index 315cdf67..cdf23c35 100644
--- a/templates/pkgbase.html
+++ b/templates/pkgbase.html
@@ -14,6 +14,9 @@
         </div>
     </div>
 
+    <!-- On-the-fly comment editing functions -->
+    <script type="text/javascript" src="/static/js/comment-edit.js"></script>
+
     {% set pkgname = result.Name %}
     {% set pkgbase_id = result.ID %}
     {% set comments = comments %}