diff --git a/website/blog/templates/blog/blog_post_page.html b/website/blog/templates/blog/blog_post_page.html
index d5d0d6e..1d82e45 100644
--- a/website/blog/templates/blog/blog_post_page.html
+++ b/website/blog/templates/blog/blog_post_page.html
@@ -1,6 +1 @@
 {% extends "common/content_page.html" %}
-
-{% block post_content %}
-  {% include "common/shareon.html" %}
-  {% include "common/comments.html" %}
-{% endblock %}
diff --git a/website/common/templates/common/content_page.html b/website/common/templates/common/content_page.html
index 1e56f3b..0fc4776 100644
--- a/website/common/templates/common/content_page.html
+++ b/website/common/templates/common/content_page.html
@@ -10,6 +10,11 @@
   {% endif %}
 {% endblock %}
 
+{% block post_content %}
+  {% include "common/shareon.html" %}
+  {% include "common/comments.html" %}
+{% endblock %}
+
 {% block extra_css %}
   {% sri_static "css/lite-youtube-embed.css" %}
   {% sri_static "contrib/shareon/shareon.min.css" %}
diff --git a/website/spotify/templates/spotify/spotify_playlist_page.html b/website/spotify/templates/spotify/spotify_playlist_page.html
index e00c36a..a987d53 100644
--- a/website/spotify/templates/spotify/spotify_playlist_page.html
+++ b/website/spotify/templates/spotify/spotify_playlist_page.html
@@ -25,5 +25,5 @@
     </table>
   </section>
 
-  {% include "common/shareon.html" %}
+  {{ block.super }}
 {% endblock %}