diff --git a/away/away.py b/away/away.py
index 14b9234..b00cff9 100644
--- a/away/away.py
+++ b/away/away.py
@@ -98,6 +98,7 @@ class Away(commands.Cog):
                 em.set_thumbnail(url=thumbnail)
         elif state == "listening":
             em = discord.Embed(color=author.activity.color)
+            url = f"https://open.spotify.com/track/{author.activity.track_id}"
             artist_title = f"{author.activity.title} by " + ", ".join(
                 a for a in author.activity.artists
             )
@@ -105,21 +106,33 @@ class Away(commands.Cog):
                 len(author.display_name) + 27
             )  # incase we go over the max allowable size
             em.set_author(
-                name=f"{author.display_name} is currently listening to {artist_title[:limit]}",
+                name=f"{author.display_name} is currently listening to",
                 icon_url=avatar,
+                url=url,
             )
-            em.description = message + "\n" + self._draw_play(author.activity)
+            em.description = (
+                f"{message}\n "
+                f"[{artist_title}]({url})\n"
+                f"{self._draw_play(author.activity)}"
+            )
+
             em.set_thumbnail(url=author.activity.album_cover_url)
         elif state == "listeningcustom":
             activity = [c for c in author.activities if c.type == discord.ActivityType.listening]
             em = discord.Embed(color=activity[0].color)
+            url = f"https://open.spotify.com/track/{activity[0].track_id}"
             artist_title = f"{activity[0].title} by " + ", ".join(a for a in activity[0].artists)
             limit = 256 - (len(author.display_name) + 27)
             em.set_author(
-                name=f"{author.display_name} is currently listening to {artist_title[:limit]}",
+                name=f"{author.display_name} is currently listening to",
                 icon_url=avatar,
+                url=url
+            )
+            em.description = (
+                f"{message}\n "
+                f"[{artist_title}]({url})\n"
+                f"{self._draw_play(activity[0])}"
             )
-            em.description = message + "\n" + self._draw_play(activity[0])
             em.set_thumbnail(url=activity[0].album_cover_url)
         elif state == "streaming":
             color = int("6441A4", 16)
@@ -393,7 +406,7 @@ class Away(commands.Cog):
     async def idle_(self, ctx, delete_after: Optional[int] = None, *, message: str = None):
         """
         Set an automatic reply when you're idle.
-        
+
         `delete_after` Optional seconds to delete the automatic reply
         `message` The custom message to display when you're mentioned
         """
@@ -414,7 +427,7 @@ class Away(commands.Cog):
     async def offline_(self, ctx, delete_after: Optional[int] = None, *, message: str = None):
         """
         Set an automatic reply when you're offline.
-        
+
         `delete_after` Optional seconds to delete the automatic reply
         `message` The custom message to display when you're mentioned
         """
@@ -499,7 +512,7 @@ class Away(commands.Cog):
     ):
         """
         Set an automatic reply when you're playing a specified game.
-        
+
         `game` The game you would like automatic responses for
         `delete_after` Optional seconds to delete the automatic reply
         `message` The custom message to display when you're mentioned
@@ -526,7 +539,7 @@ class Away(commands.Cog):
     async def _ignore(self, ctx):
         """
         Toggle away messages on the whole server.
-        
+
         Mods, Admins and Bot Owner are immune to this.
         """
         guild = ctx.message.guild
@@ -547,7 +560,7 @@ class Away(commands.Cog):
     async def awaytextonly(self, ctx):
         """
         Toggle forcing the guild's away messages to be text only.
-        
+
         This overrides the embed_links check this cog uses for message sending.
         """
         text_only = await self._away.guild(ctx.guild).TEXT_ONLY()