diff --git a/vrobbler/apps/podcasts/views.py b/vrobbler/apps/podcasts/views.py
index 26bedc6..eb954ab 100644
--- a/vrobbler/apps/podcasts/views.py
+++ b/vrobbler/apps/podcasts/views.py
@@ -1,15 +1,15 @@
 import datetime
 from django.utils import timezone
 from django.views import generic
-from podcasts.models import Podcast
+from podcasts.models import Podcast, PodcastEpisode
 
 from scrobbles.models import Scrobble
 from scrobbles.views import ScrobbleableListView, ScrobbleableDetailView
 
 
-class PodcastListView(generic.ListView):
-    model = Podcast
-    paginate_by = 20
+class PodcastListView(ScrobbleableListView):
+    model = PodcastEpisode
+    template_name = "podcasts/podcast_list.html"
 
     def get_context_data(self, **kwargs):
         context_data = super().get_context_data(**kwargs)
@@ -36,10 +36,7 @@ class PodcastListView(generic.ListView):
             if podcast:
                 podcasts_this_week[podcast.id] = {
                     "podcast": podcast,
-                    "count": podcasts_this_week.get(podcast.id, {}).get(
-                        "count", 0
-                    )
-                    + 1,
+                    "count": podcasts_this_week.get(podcast.id, {}).get("count", 0) + 1,
                 }
 
         podcasts_this_month = {}
@@ -48,9 +45,7 @@ class PodcastListView(generic.ListView):
             if podcast:
                 podcasts_this_month[podcast.id] = {
                     "podcast": podcast,
-                    "count": podcasts_this_month.get(podcast.id, {}).get(
-                        "count", 0
-                    )
+                    "count": podcasts_this_month.get(podcast.id, {}).get("count", 0)
                     + 1,
                 }
 
diff --git a/vrobbler/templates/_scrobblable_list.html b/vrobbler/templates/_scrobblable_list.html
index f9c529c..8dde497 100644
--- a/vrobbler/templates/_scrobblable_list.html
+++ b/vrobbler/templates/_scrobblable_list.html
@@ -6,6 +6,9 @@
         <tr>
             <th scope="col">Latest</th>
             <th scope="col">Title</th>
+            {% if podcast_list or object_list.0.podcast %}
+            <th scope="col">Podcast</th>
+            {% endif %}
             <th scope="col">Scrobbles</th>
             <th scope="col">Start</th>
         </tr>
@@ -16,6 +19,9 @@
         <tr>
             <td><a href="{{obj.scrobble_set.last.get_absolute_url}}">{{obj.scrobble_set.last.local_timestamp}}
             <td><a href="{{obj.get_absolute_url}}">{{obj}}</a></td>
+            {% if podcast_list or obj.podcast %}
+            <td>{% if obj.podcast %}<a href="{{obj.podcast.get_absolute_url}}">{{obj.podcast}}</a>{% endif %}</td>
+            {% endif %}
             {% if request.user.is_authenticated %}
             <td>{{obj.scrobble_count}}</td>
             <td><a type="button" class="btn btn-sm btn-primary" href="{{obj.start_url}}">Scrobble</a></td>
diff --git a/vrobbler/templates/podcasts/podcast_list.html b/vrobbler/templates/podcasts/podcast_list.html
index aec49c4..b86bf93 100644
--- a/vrobbler/templates/podcasts/podcast_list.html
+++ b/vrobbler/templates/podcasts/podcast_list.html
@@ -52,27 +52,7 @@
 <div class="row">
     <div class="col-md">
         <div class="table-responsive">
-            <table class="table table-striped table-sm">
-                <thead>
-                    <tr>
-                        <th scope="col">Episode</th>
-                        <th scope="col">Podcast</th>
-                        <th scope="col">Scrobbles</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for obj in object_list.all %}
-                        {{obj.episodes}}
-                    {% for episode in obj.podcastepisode_set.all %}
-                    <tr>
-                        <td><a href="{{episode.get_absolute_url}}">{{episode}}</a></td>
-                        <td><a href="{{obj.get_absolute_url}}">{{obj}}</a></td>
-                        <td>{{episode.scrobble_set.count}}</td>
-                    </tr>
-                    {% endfor %}
-                    {% endfor %}
-                </tbody>
-            </table>
+            {% include "_scrobblable_list.html" %}
         </div>
     </div>
 </div>