diff --git a/jarvis/cogs/starboard.py b/jarvis/cogs/starboard.py
index 325ef15..5f4ad68 100644
--- a/jarvis/cogs/starboard.py
+++ b/jarvis/cogs/starboard.py
@@ -2,13 +2,12 @@ from datetime import datetime
 
 import aiohttp
 import discord
+import jarvis
 from discord import Message, TextChannel
 from discord.ext import commands
 from discord.utils import find
 from discord_slash import SlashContext, cog_ext
 from discord_slash.utils.manage_commands import create_option
-
-import jarvis
 from jarvis.config import get_config
 from jarvis.utils import build_embed
 from jarvis.utils.db import DBManager
@@ -187,6 +186,9 @@ class StarboardCog(commands.Cog):
             )
             return
 
+        count = self.db.jarvis.stars.find(
+            {"guild": message.guild.id, "starboard": starboard.id}
+        ).count()
         content = message.content
 
         attachments = message.attachments
@@ -200,7 +202,7 @@ class StarboardCog(commands.Cog):
             content = "\u200b"
 
         embed = build_embed(
-            title="Click Here to view context",
+            title=f"[#{count}] Click Here to view context",
             description=content,
             fields=[],
             url=message.jump_url,
@@ -221,6 +223,7 @@ class StarboardCog(commands.Cog):
 
         self.db.jarvis.stars.insert_one(
             {
+                "index": count,
                 "message": message.id,
                 "channel": message.channel.id,
                 "guild": message.guild.id,
@@ -238,3 +241,6 @@ class StarboardCog(commands.Cog):
 
 def setup(bot):
     bot.add_cog(StarboardCog(bot))
+
+
+cog(StarboardCog(bot))