diff --git a/app/assets/stylesheets/components/_card.scss b/app/assets/stylesheets/components/_card.scss
index 94280577..ce3aec2f 100644
--- a/app/assets/stylesheets/components/_card.scss
+++ b/app/assets/stylesheets/components/_card.scss
@@ -31,6 +31,7 @@
 }
 
 .c-card__body__text {
+  display: block;
   margin-bottom: spacing("tiny");
 }
 
diff --git a/app/views/albums/_album.html.erb b/app/views/albums/_album.html.erb
index ddbf5503..78d18acb 100644
--- a/app/views/albums/_album.html.erb
+++ b/app/views/albums/_album.html.erb
@@ -3,7 +3,7 @@
     <%= image_tag image_url_for(album), class: "u-image-fluid" %>
   <% end %>
   <div class='c-card__body'>
-    <p class='c-card__body__text u-text-weight-bold u-text-line-clamp-2'><%= link_to album.name, album_path(album) %></p>
-    <p class='c-card__body__text u-text-line-clamp-2'><%= album.artist.name %></p>
+    <%= link_to album.name, album_path(album), class: "c-card__body__text u-text-weight-bold u-text-line-clamp-2" %>
+    <%= link_to album.artist.name, artist_path(album.artist), class: "c-card__body__text u-text-line-clamp-2" %>
   </div>
 </div>
diff --git a/app/views/albums/show.html.erb b/app/views/albums/show.html.erb
index 6adf25f2..3c21b722 100644
--- a/app/views/albums/show.html.erb
+++ b/app/views/albums/show.html.erb
@@ -5,7 +5,7 @@
     <%= image_tag image_url_for(@album), class: "c-card__image u-image-large", data: {test_id: "album_image"} %>
     <div class='c-card__body'>
       <h1 class='c-card__body__title'><%= @album.name %></h1>
-      <p class='c-card__body__text'><%= @album.artist.name %></p>
+      <%= link_to @album.artist.name, artist_path(@album.artist), class: "c-card__body__text" %>
       <div class='c-card__body__text'>
         <span><%= @album.songs.count %> <%= t("label.tracks") %></span>
         <span>,</span>