diff --git a/vrobbler/apps/scrobbles/admin.py b/vrobbler/apps/scrobbles/admin.py
index c5d8d77..6894a0c 100644
--- a/vrobbler/apps/scrobbles/admin.py
+++ b/vrobbler/apps/scrobbles/admin.py
@@ -27,6 +27,7 @@ class ScrobbleInline(admin.TabularInline):
         "mood",
         "brickset",
         "trail",
+        "beer",
         "web_page",
         "life_event",
         "user",
@@ -123,6 +124,7 @@ class ScrobbleAdmin(admin.ModelAdmin):
         "mood",
         "brickset",
         "trail",
+        "beer",
         "web_page",
         "life_event",
     )
diff --git a/vrobbler/apps/scrobbles/models.py b/vrobbler/apps/scrobbles/models.py
index e86962a..a50fe7a 100644
--- a/vrobbler/apps/scrobbles/models.py
+++ b/vrobbler/apps/scrobbles/models.py
@@ -912,6 +912,8 @@ class Scrobble(TimeStampedModel):
             media_obj = self.brickset
         if self.trail:
             media_obj = self.trail
+        if self.beer:
+            media_obj = self.beer
         if self.task:
             media_obj = self.task
         return media_obj
diff --git a/vrobbler/templates/base.html b/vrobbler/templates/base.html
index 22aac64..cdd80ff 100644
--- a/vrobbler/templates/base.html
+++ b/vrobbler/templates/base.html
@@ -264,6 +264,12 @@
                                 Trails
                                 </a>
                             </li>
+                            <li class="nav-item">
+                                <a class="nav-link" href="/beers/">
+                                <span data-feather="beer"></span>
+                                Beers
+                                </a>
+                            </li>
                             <li class="nav-item">
                                 <a class="nav-link" href="/imports/">
                                 <span data-feather="log"></span>