diff --git a/app/assets/javascripts/comment.js b/app/assets/javascripts/comment.js
index da5dc92abf..039b5af104 100644
--- a/app/assets/javascripts/comment.js
+++ b/app/assets/javascripts/comment.js
@@ -1,5 +1,4 @@
-(function() {
-
+$(function() {
   $('.comment-form').each(function() {
     if(!$(this).hasClass('bound-success')) {
       $(this).addClass('bound-success').on('ajax:success', function(e, data, status, xhr){
@@ -46,7 +45,7 @@
     }
 
   });
-}());
+});
 
 function insertTitleSuggestionTemplate() {
   var element = $('#text-input');
diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
index 886d12d68d..3e949f50a3 100644
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -103,11 +103,8 @@
           $E.refresh();
         }
       </script>
-
-      <%= javascript_include_tag "dragdrop" %>
       <script src="/emoji.js" type="text/javascript"></script>
       <script src="/assets/atwho_autocomplete.js" type="text/javascript"></script>
-      <%= javascript_include_tag "comment.js" %>
 
       <div class="control-group">
         <button type="submit" class="btn btn-primary"><%= translation('comments._form.publish') %></button>
diff --git a/app/views/notes/_comments.html.erb b/app/views/notes/_comments.html.erb
index 38a520eefd..985a6c14d0 100644
--- a/app/views/notes/_comments.html.erb
+++ b/app/views/notes/_comments.html.erb
@@ -2,7 +2,8 @@
   <div id="comments" class="col-lg-10 comments">
     <% comments = @node.comments_viewable_by(current_user) %>
     <h3><span id="comment-count"><%= comments.size %></span> <%= translation('notes._comments.comments') %></h3>
-
+    <%= javascript_include_tag "dragdrop" %>
+    <%= javascript_include_tag "comment" %>
     <div style="margin-bottom: 50px;" id="comments-list">
       <% comments.includes([:replied_comments, :node]).order('timestamp ASC').each do |comment| %>
         <% if comment.cid == @node.comments&.first&.cid %><a id="last" name="last"></a><% end %>
diff --git a/app/views/questions/show.html.erb b/app/views/questions/show.html.erb
index 24a1e6f0f4..9bb7fee155 100644
--- a/app/views/questions/show.html.erb
+++ b/app/views/questions/show.html.erb
@@ -55,6 +55,8 @@
   <% comments = @node.comments_viewable_by(current_user) %>
   <h3><span id="comment-count"><%= comments.size %></span> Comments</h3>
     <div id="comments-list">
+    <%= javascript_include_tag "dragdrop" %>
+    <%= javascript_include_tag "comment" %>
       <% comments.includes([:node, :replied_comments]).order("timestamp ASC").each do |comment| %>
         <% if comment.reply_to.nil? %>
           <%= render :partial => "notes/comment", :locals => {:comment => comment} %>
diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb
index 875a37e571..2ddc8a1bec 100644
--- a/app/views/wiki/show.html.erb
+++ b/app/views/wiki/show.html.erb
@@ -32,7 +32,7 @@
 
     <div class="tab-pane active" id="tab-overview">
       <% if controller.action_name == 'comments' %>
-          <%= render partial: "notes/comments", :locals => {:nodes => @nodes} %>
+        <%= render partial: "notes/comments", :locals => {:nodes => @nodes} %>
       <% else %>
         <div <% unless @node.has_tag('style:wide') %>style="max-width:800px;"<% end %> id="content" class="pl-content wiki">
           <% if @node.has_tag('format:raw') %>