diff --git a/Wave/Components/ArticleComponent.razor b/Wave/Components/ArticleComponent.razor
index e5d1aca..ddf0253 100644
--- a/Wave/Components/ArticleComponent.razor
+++ b/Wave/Components/ArticleComponent.razor
@@ -31,9 +31,7 @@
         @if (Article.Categories.Count > 0) {
 	        <p class="flex flex-wrap gap-2 my-3">
 		        @foreach (var category in Article.Categories.OrderBy(c => c.Color)) {
-			        <span class="badge badge-@CategoryUtilities.GetCssClassPostfixForColor(category.Color)">
-						@category.Name
-					</span>
+			        <CategoryBadgeComponent Category="category" />
 		        }
 	        </p>
         }
diff --git a/Wave/Components/CategoryBadgeComponent.razor b/Wave/Components/CategoryBadgeComponent.razor
new file mode 100644
index 0000000..8445088
--- /dev/null
+++ b/Wave/Components/CategoryBadgeComponent.razor
@@ -0,0 +1,14 @@
+@using Wave.Utilities
+@using Wave.Data
+
+<span class="badge badge-@CategoryUtilities.GetCssClassPostfixForColor(Category.Color)" @attributes="AdditionalAttributes">
+	@Category.Name
+</span>
+
+@code {
+	[Parameter]
+	public required Category Category { get; set; }
+	[Parameter(CaptureUnmatchedValues = true)]
+	public Dictionary<string, object>? AdditionalAttributes { get; set; }
+	
+}
\ No newline at end of file