diff --git a/app/site.rb b/app/site.rb
index a6d0e397..91f88ec7 100644
--- a/app/site.rb
+++ b/app/site.rb
@@ -134,7 +134,7 @@ post '/site/:username/comment' do |username|
      site.is_blocking?(current_site) ||
      current_site.is_blocking?(site) ||
      current_site.commenting_allowed? == false)
-    redirect "/site/#{username}"
+    redirect request.referrer
   end
 
   site.add_profile_comment(
@@ -142,7 +142,7 @@ post '/site/:username/comment' do |username|
     message: params[:message]
   )
 
-  redirect "/site/#{username}"
+  redirect request.referrer
 end
 
 get '/site/:username/tip' do |username|
diff --git a/views/home.erb b/views/home.erb
index 61926895..6bfdea6d 100644
--- a/views/home.erb
+++ b/views/home.erb
@@ -36,6 +36,9 @@
               Below are some website suggestions for you. For more, <a href="/browse">check out all the sites on Neocities</a>!
             </p>
           </div>
+        <% else %>
+          <%== erb :'site/_profile_comments', locals: {site: site} %>
+          <div style="margin-bottom: 15px"></div>
         <% end %>
 
         <% if !@events.empty? %>
diff --git a/views/site.erb b/views/site.erb
index 2a095281..c8d67edb 100644
--- a/views/site.erb
+++ b/views/site.erb
@@ -64,34 +64,7 @@
 <div class="container site-profile">
 <div class="content misc-page columns right-col"><div class="col-left">
   <div class="col col-66">
-    <% if current_site && site.profile_comments_enabled %>
-
-        <div class="post-comment">
-          <form method="POST" action="/site/<%= site.username %>/comment">
-            <input name="csrf_token" type="hidden" value="<%= csrf_token %>">
-            <input name="message"
-                   type="text"
-                   placeholder="Post a message..."
-                   autocomplete="off"
-                   maxlength="<%= Site::MAX_COMMENT_SIZE %>"
-                   <% unless current_site.commenting_allowed? %>disabled<% end %>
-            >
-            <button class="btn-Action"
-                    <% unless current_site.commenting_allowed? %>disabled<% end %>
-            >Post</button>
-          </form>
-
-          <% unless current_site.commenting_allowed? %>
-              <p class="comment-policy">
-                  <% if current_site.commenting_too_much? %>
-                    To prevent spam, we have a <%= Site::MAX_COMMENTS_PER_DAY %> comment per day limit. Please try commenting again tomorrow!
-                  <% else %>
-                    To prevent spam, you cannot comment until you have updated your site <strong><%= Site::COMMENTING_ALLOWED_UPDATED_COUNT %> times</strong> (on <%= Site::COMMENTING_ALLOWED_UPDATED_COUNT %> separate days), and your account is one week old. While waiting, now is a great time to <a href="/dashboard">start building your awesome site!</a>
-                  <% end %>
-              </p>
-          <% end %>
-        </div>
-    <% end %>
+    <%== erb :'site/_profile_comments', locals: {site: site} %>
 
     <% if @latest_events.empty? %>
       <div class="site-profile-padding">
diff --git a/views/site/_profile_comments.erb b/views/site/_profile_comments.erb
new file mode 100644
index 00000000..45f43488
--- /dev/null
+++ b/views/site/_profile_comments.erb
@@ -0,0 +1,27 @@
+<% if current_site && site.profile_comments_enabled %>
+  <div class="post-comment">
+    <form method="POST" action="/site/<%= site.username %>/comment">
+      <input name="csrf_token" type="hidden" value="<%= csrf_token %>">
+      <input name="message"
+             type="text"
+             placeholder="Post a message..."
+             autocomplete="off"
+             maxlength="<%= Site::MAX_COMMENT_SIZE %>"
+             <% unless current_site.commenting_allowed? %>disabled<% end %>
+      >
+      <button class="btn-Action"
+              <% unless current_site.commenting_allowed? %>disabled<% end %>
+      >Post</button>
+    </form>
+
+    <% unless current_site.commenting_allowed? %>
+        <p class="comment-policy">
+            <% if current_site.commenting_too_much? %>
+              To prevent spam, we have a <%= Site::MAX_COMMENTS_PER_DAY %> comment per day limit. Please try commenting again tomorrow!
+            <% else %>
+              To prevent spam, you cannot comment until you have updated your site <strong><%= Site::COMMENTING_ALLOWED_UPDATED_COUNT %> times</strong> (on <%= Site::COMMENTING_ALLOWED_UPDATED_COUNT %> separate days), and your account is one week old. While waiting, now is a great time to <a href="/dashboard">start building your awesome site!</a>
+            <% end %>
+        </p>
+    <% end %>
+  </div>
+<% end %>