diff --git a/mastodon/mastodon.go b/mastodon/mastodon.go
index c04080a..b3edde5 100644
--- a/mastodon/mastodon.go
+++ b/mastodon/mastodon.go
@@ -322,6 +322,7 @@ type Emoji struct {
 	ShortCode       string `json:"shortcode"`
 	StaticURL       string `json:"static_url"`
 	URL             string `json:"url"`
+	Category        *string `json:"category"`
 	VisibleInPicker bool   `json:"visible_in_picker"`
 }
 
diff --git a/templates/emoji.tmpl b/templates/emoji.tmpl
index dcd0259..c5eb0d0 100644
--- a/templates/emoji.tmpl
+++ b/templates/emoji.tmpl
@@ -5,14 +5,15 @@
 <div class="emoji-list-container">
 	{{$emoji_filter := $.Ctx.InstanceEmojiFilter}}
 	{{range .Emojis}}
-	{{if Allowed_emoji_page .ShortCode $emoji_filter}}
+		{{if Allowed_emoji_page .ShortCode $emoji_filter}}
 	<div class="emoji-item-container">
 		<div class="emoji-item">
 			<img class="emoji" src="{{.URL}}" alt="{{.ShortCode}}" height="32" loading="lazy" />
-			<span title=":{{.ShortCode}}:" class="emoji-shortcode">:{{.ShortCode}}:</span>
+			<span title=":{{.ShortCode}}:{{if .Category}} Category:{{.Category}}{{end}}" class="emoji-shortcode">:{{.ShortCode}}:</span>
+	
 		</div>
 	</div>
-	{{end}}
+		{{end}}
 	{{end}}
 </div>