diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb
index 0894f7f24..9bf49d054 100644
--- a/app/views/layouts/default.html.erb
+++ b/app/views/layouts/default.html.erb
@@ -71,6 +71,8 @@
       window._paq.push(["setCustomVariable", 3, "postUpdateCount", <%= CurrentUser.post_update_count.to_i / 100 %>, "visit"]);
       window._paq.push(["setCustomVariable", 4, "favoriteCount", <%= CurrentUser.favorite_count.to_i / 100 %>, "visit"]);
     <% end %>
+
+    window.addthis_config = { ui_click: true };
   </script>
   <%= yield :html_header %>
   <%= raw Danbooru.config.custom_html_header_content %>
diff --git a/app/views/posts/index.html.erb b/app/views/posts/index.html.erb
index a7ffaa4f6..e1150f9ce 100644
--- a/app/views/posts/index.html.erb
+++ b/app/views/posts/index.html.erb
@@ -10,10 +10,12 @@
     <%= @post_set.presenter.tag_list_html(current_query: params[:tags], show_extra_links: CurrentUser.user.is_gold?) %>
   </section>
 
-  <section id="post-share">
-    <h1>Share</h1>
-    <%= render "posts/partials/index/share" %>
-  </section>
+  <% if Danbooru.config.addthis_key.present? %>
+    <section id="post-share">
+      <h1>Share</h1>
+      <%= render "posts/partials/index/share" %>
+    </section>
+  <% end %>
 
   <%= render "posts/partials/index/options" %>
 
diff --git a/app/views/posts/partials/index/_share.html.erb b/app/views/posts/partials/index/_share.html.erb
index 8d4793dad..f31f6f09a 100644
--- a/app/views/posts/partials/index/_share.html.erb
+++ b/app/views/posts/partials/index/_share.html.erb
@@ -1,6 +1,5 @@
-<% if Danbooru.config.addthis_key %>
-
-<div class="addthis_toolbox addthis_default_style addthis_32x32_style">
+<div class="addthis_toolbox addthis_default_style addthis_32x32_style"
+     addthis:title="Find more art about <%= @post_set.humanized_tag_string %> on <%= Danbooru.config.app_name %>">
   <a class="addthis_button_twitter"></a>
   <a class="addthis_button_facebook"></a>
   <a class="addthis_button_reddit"></a>
@@ -8,24 +7,4 @@
   <a class="addthis_button_compact"></a>
 </div>
 
-<script type="text/javascript">
-  window.addthis_config = {"data_track_addressbar": false, "pubid": "<%= Danbooru.config.addthis_key %>"};
-  <% if params[:tags].present? %>
-	  window.addthis_share = {
-	    "url":"<%= j posts_url(tags: params[:tags]) %>",
-	    "title": "Find more art about <%= escape_javascript @post_set.humanized_tag_string %> on <%= Danbooru.config.app_name %>"
-	  };
-	<% else %>
-    window.addthis_share = {
-      "url":"<%= j posts_url %>",
-      "title": "Find good anime art fast on <%= Danbooru.config.app_name %>"
-    };
-  <% end %>
-  $(function() {
-  	addthis.init();
-  });
-</script>
-
-<script type="text/javascript" src="https://s7.addthis.com/js/300/addthis_widget.js#async=1"></script>
-
-<% end %>
+<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=<%= Danbooru.config.addthis_key %>" async="async"></script>
diff --git a/app/views/posts/partials/show/_share.html.erb b/app/views/posts/partials/show/_share.html.erb
index 0e2a65464..37822ac9f 100644
--- a/app/views/posts/partials/show/_share.html.erb
+++ b/app/views/posts/partials/show/_share.html.erb
@@ -1,6 +1,5 @@
-<% if Danbooru.config.addthis_key %>
-
-<div class="addthis_toolbox addthis_default_style addthis_32x32_style">
+<div class="addthis_toolbox addthis_default_style addthis_32x32_style"
+     addthis:title="<%= post.presenter.humanized_essential_tag_string.html_safe %>">
   <a class="addthis_button_twitter"></a>
   <a class="addthis_button_facebook"></a>
   <a class="addthis_button_reddit"></a>
@@ -8,17 +7,4 @@
   <a class="addthis_button_compact"></a>
 </div>
 
-<script type="text/javascript">
-  window.addthis_config = {"data_track_addressbar": false, "pubid": "<%= Danbooru.config.addthis_key %>"};
-  window.addthis_share = {
-    "url":"<%= j post_url(post) %>",
-    "title": "<%= escape_javascript post.presenter.humanized_essential_tag_string.html_safe %> on <%= Danbooru.config.app_name %>"
-  };
-  $(function() {
-  	addthis.init();
-  });
-</script>
-
-<script type="text/javascript" src="https://s7.addthis.com/js/300/addthis_widget.js#async=1"></script>
-
-<% end %>
+<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=<%= Danbooru.config.addthis_key %>" async="async"></script>
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index 7844d8577..084298b7b 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -12,10 +12,12 @@
     <%= render "posts/partials/show/information", :post => @post %>
   </section>
 
-  <section id="post-share">
-    <h1>Share</h1>
-    <%= render "posts/partials/show/share", :post => @post %>
-  </section>
+  <% if Danbooru.config.addthis_key.present? %>
+    <section id="post-share">
+      <h1>Share</h1>
+      <%= render "posts/partials/show/share", post: @post %>
+    </section>
+  <% end %>
 
   <section id="post-options">
     <h1>Options</h1>